diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-01-19 01:28:28 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-01-19 01:28:28 +0000 |
| commit | cd9794bea70abf780a5b6e645799b2cd829b0c77 (patch) | |
| tree | 95a98c135a23601198721299716952ab1753c1d6 | |
| parent | 0c57b989f563767aeba00e63dcbdf42845e3b37e (diff) | |
| download | brdo-cd9794bea70abf780a5b6e645799b2cd829b0c77.tar.gz brdo-cd9794bea70abf780a5b6e645799b2cd829b0c77.tar.bz2 | |
#360113 by Dave Reid: Remove db_and() and db_or() calls from database/* files.
| -rw-r--r-- | includes/database/mysql/schema.inc | 6 | ||||
| -rw-r--r-- | includes/database/schema.inc | 8 | ||||
| -rw-r--r-- | includes/database/sqlite/query.inc | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index b12aa525a..3a525a1f3 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -32,9 +32,9 @@ class DatabaseSchema_mysql extends DatabaseSchema { $schema = $info['default']['database']; } - $condition = db_and() - ->condition('table_schema', $schema) - ->condition('table_name', $table_name, $operator); + $condition = new DatabaseCondition('AND'); + $condition->condition('table_schema', $schema); + $condition->condition('table_name', $table_name, $operator); return $condition; } diff --git a/includes/database/schema.inc b/includes/database/schema.inc index dac0f5406..5b4304dce 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -157,10 +157,10 @@ abstract class DatabaseSchema { $schema = 'public'; } - $condition = db_and() - ->condition('table_catalog', $info['default']['database']) - ->condition('table_schema', $schema) - ->condition('table_name', $table_name, $operator); + $condition = new DatabaseCondition('AND'); + $condition->condition('table_catalog', $info['default']['database']); + $condition->condition('table_schema', $schema); + $condition->condition('table_name', $table_name, $operator); return $condition; } diff --git a/includes/database/sqlite/query.inc b/includes/database/sqlite/query.inc index 364b618b4..fb73d3297 100644 --- a/includes/database/sqlite/query.inc +++ b/includes/database/sqlite/query.inc @@ -75,7 +75,7 @@ class UpdateQuery_sqlite extends UpdateQuery { $this->removeFieldsInCondition($fields, $this->condition); // Add the inverse of the fields to the condition. - $condition = db_or(); + $condition = new DatabaseCondition('OR'); foreach ($fields as $field => $data) { if (is_array($data)) { // The field is an expression. |