stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-25 22:09:11 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt to reduce the chance of replacing text in sql statements that

Browse Source 
is not a table name (but contained in braces) with the database prefix
by building and maintaining a cache of database tables and prefixes.
This commit is contained in:
Tim Almdal
2009-03-12 03:20:13 +00:00
parent e58b955d4a
commit d1f181da08
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/libraries/MY_Database.php
View File

@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class Database extends Database_Core {
protected $_table_names;
public function open_paren() {
$this->where[] = "(";
return $this;
@@ -56,6 +58,30 @@ class Database extends Database_Core {
public function add_table_prefixes($sql) {
$prefix = $this->config["table_prefix"];
return preg_replace("#{([a-zA-Z0-9_]+)}#", "{$prefix}$1", $sql);
if (strpos($sql, "SHOW TABLES") === 0) {
/*
* Don't ignore "show tables", otherwise we could have a infinite
* @todo this may have to be changed if we support more than mysql
*/
return $sql;
} else if (strpos($sql, "CREATE TABLE") === 0) {
// Creating a new table add it to the table cache.
$open_brace = strpos($sql, "{") + 1;
$close_brace = strpos($sql, "}", $open_brace);
$name = substr($sql, $open_brace, $close_brace - $open_brace);
$this->_table_names["{{$name}}"] = "{$prefix}$name";
}
if (!isset($this->_table_names)) {
// This should only run once on the first query
$this->_table_names =array();
$len = strlen($prefix);
foreach($this->list_tables() as $table_name) {
$naked_name = strpos($table_name, $prefix) !== 0 ? $table_name : substr($table_name, $len);
$this->_table_names["{{$naked_name}}"] = $table_name;
}
}
return empty($this->_table_names) ? $sql : strtr($sql, $this->_table_names);
}
}