From 86b89805f706ba559e206010c5b05ad950ccfd98 Mon Sep 17 00:00:00 2001
From: Hendrik Grahl <hendrik@grahl.ch>
Date: Mon, 10 Aug 2015 21:28:59 +0200
Subject: [PATCH] 2547749 Remove deprecated calls

---
 search_api_db/src/Plugin/search_api/backend/Database.php | 10 +++++-----
 src/Plugin/views/filter/SearchApiTerm.php                |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/search_api_db/src/Plugin/search_api/backend/Database.php b/search_api_db/src/Plugin/search_api/backend/Database.php
index 538c20f..6aef33e 100644
--- a/search_api_db/src/Plugin/search_api/backend/Database.php
+++ b/search_api_db/src/Plugin/search_api/backend/Database.php
@@ -1718,7 +1718,7 @@ class Database extends BackendPluginBase {
         }
       }
       else {
-        $or = db_or();
+        $or = new Condition('OR');
         foreach ($negated as $k) {
           $or->condition('t.item_id', $this->createKeysQuery($k, $fields, $all_fields, $index), 'NOT IN');
         }
@@ -1757,7 +1757,7 @@ class Database extends BackendPluginBase {
    *   Thrown if an unknown field was used in the filter.
    */
   protected function createFilterCondition(FilterInterface $filter, array $fields, SelectInterface $db_query, IndexInterface $index) {
-    $cond = db_condition($filter->getConjunction());
+    $cond =  new Condition($filter->getConjunction());
     $empty = TRUE;
     // Store whether a JOIN already occurred for a field, so we don't JOIN
     // repeatedly for OR filters.
@@ -1782,7 +1782,7 @@ class Database extends BackendPluginBase {
           // @todo Stop recognizing "!=" as an operator.
           $operator = ($f[2] == '<>' || $f[2] == '!=') ? 'NOT LIKE' : 'LIKE';
           $prefix = Utility::createCombinedId($f[1], '');
-          $cond->condition($alias . '.item_id', db_like($prefix) . '%', $operator);
+          $cond->condition($alias . '.item_id', Database::getConnection()->escapeLike($prefix) . '%', $operator);
           continue;
         }
         if (!isset($fields[$f[0]])) {
@@ -1893,7 +1893,7 @@ class Database extends BackendPluginBase {
 
       if (empty($facet['operator']) || $facet['operator'] != 'or') {
         // All the AND facets can use the main query.
-        $select = db_select($table, 't');
+        $select = Database::getConnection()->select($table, 't');
       }
       else {
         // For OR facets, we need to build a different base query that excludes
@@ -1907,7 +1907,7 @@ class Database extends BackendPluginBase {
           }
         }
         $or_db_query = $this->createDbQuery($or_query, $fields);
-        $select = db_select($or_db_query, 't');
+        $select = Database::getConnection()->select($or_db_query, 't');
       }
 
       // If "Include missing facet" is disabled, we use an INNER JOIN and add IS
diff --git a/src/Plugin/views/filter/SearchApiTerm.php b/src/Plugin/views/filter/SearchApiTerm.php
index 10f7666..689a77b 100644
--- a/src/Plugin/views/filter/SearchApiTerm.php
+++ b/src/Plugin/views/filter/SearchApiTerm.php
@@ -97,7 +97,7 @@ class SearchApiTerm extends SearchApiFilterEntityBase {
       }
       else {
         $options = array();
-        $query = db_select('taxonomy_term_data', 'td');
+        $query = Database::getConnection()->select('taxonomy_term_data', 'td');
         $query->innerJoin('taxonomy_vocabulary', 'tv', 'td.vid = tv.vid');
         $query->fields('td');
         $query->orderby('tv.weight');
@@ -255,7 +255,7 @@ class SearchApiTerm extends SearchApiFilterEntityBase {
       return array();
     }
 
-    $query = db_select('taxonomy_term_data', 'td');
+    $query = Database::getConnection()->select('taxonomy_term_data', 'td');
     $query->innerJoin('taxonomy_vocabulary', 'tv', 'td.vid = tv.vid');
     $query->fields('td');
     $query->condition('td.name', $names);
@@ -303,7 +303,8 @@ class SearchApiTerm extends SearchApiFilterEntityBase {
    * {@inheritdoc}
    */
   protected function idsToString(array $ids) {
-    return implode(', ', db_select('taxonomy_term_data', 'td')
+
+    return implode(', ', Database::getConnection()->select('taxonomy_term_data', 'td')
       ->fields('td', array('name'))
       ->condition('td.tid', array_filter($ids))
       ->execute()
-- 
2.3.8 (Apple Git-58)