Commit df7bcec7 authored by webchick's avatar webchick

#302395 by chx: Minor DBTNG clean-up.

parent c17a5e70
......@@ -250,7 +250,7 @@ protected function prefixTables($sql) {
/**
* Prepare a query string and return the prepared statement.
*
*
* This method statically caches prepared statements, reusing them when
* possible. It also prefixes tables names enclosed in curly-braces.
*
......@@ -712,7 +712,7 @@ abstract class Database {
* TRUE if there is at least one database connection established, FALSE otherwise.
*/
final public static function isActiveConnection() {
return !empty(self::$connections);
return !empty(self::$activeKey) && !empty(self::$connections) && !empty(self::$connections[self::$activeKey]);
}
/**
......@@ -1356,7 +1356,7 @@ function db_escape_table($table) {
* query: the SQL query executed, passed through check_plain()
*/
function update_sql($sql) {
$result = Database::getActiveConnection()->query($sql/*, array(true)*/);
$result = Database::getActiveConnection()->query($sql);
return array('success' => $result !== FALSE, 'query' => check_plain($sql));
}
......
......@@ -117,29 +117,29 @@
*/
abstract class DatabaseSchema {
protected $connection;
public function __construct($connection) {
$this->connection = $connection;
}
/**
* Check if a table exists.
*/
abstract public function tableExists($table);
/**
* Check if a column exists in the given table.
*/
abstract public function columnExists($table, $column);
/**
* This maps a generic data type in combination with its data size
* to the engine-specific data type.
*/
abstract public function getFieldTypeMap();
/**
* Rename a table.
*
......@@ -161,7 +161,7 @@ public function __construct($connection) {
* The table to be dropped.
*/
abstract public function dropTable(&$ret, $table);
/**
* Add a new field to a table.
*
......@@ -380,7 +380,7 @@ public function createTable(&$ret, $name, $table) {
$ret[] = update_sql($statement);
}
}
/**
* Return an array of field names from an array of key/index column specifiers.
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment