Commit cd9794be authored by webchick's avatar webchick

#360113 by Dave Reid: Remove db_and() and db_or() calls from database/* files.

parent 0c57b989
......@@ -32,9 +32,9 @@ protected function buildTableNameCondition($table_name, $operator = '=') {
$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;
}
......
......@@ -157,10 +157,10 @@ protected function buildTableNameCondition($table_name, $operator = '=') {
$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;
}
......
......@@ -75,7 +75,7 @@ public function execute() {
$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.
......
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