add indexName

mia3 · May 14, 2017 · 7e0ac5b · 7e0ac5b
1 parent 676768b
commit 7e0ac5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Adapter/MySQLAdapter.php b/src/Adapter/MySQLAdapter.php
@@ -80,7 +80,7 @@ public function __construct($configuration)
 
     public function addObject($object, $objectId, $indexName = null)
     {
-        $id = $this->getObject($objectId, serialize($object));
+        $id = $this->getObject($objectId, serialize($object), $indexName);
         $this->connection->query(sprintf('DELETE FROM %scontents WHERE object = "%s"',
             $this->configuration['table_prefix'], $id));
 
@@ -116,7 +116,7 @@ protected function insertContent($id, $key, $value)
         $query->execute();
     }
 
-    public function getObject($objectId, $data)
+    public function getObject($objectId, $data, $indexName)
     {
         $query = sprintf('SELECT id FROM %sobjects WHERE objectId = "%s"', $this->configuration['table_prefix'],
             $objectId);
@@ -126,28 +126,30 @@ public function getObject($objectId, $data)
             $timestamp = time();
             $query = $this->connection->prepare(sprintf('
                 UPDATE %sobjects
-                SET data = ?, updated = ?
+                SET data = ?, updated = ?, `index` = ?
                 WHERE id = ?
                 ',
                 $this->configuration['table_prefix']
             ));
-            $query->bind_param("sii", $data, $timestamp, $row['id']);
+            $query->bind_param("siis", $data, $timestamp, $row['id'], $indexName);
             $query->execute();
 
             return intval($row['id']);
         }
 
         $query = $this->connection->prepare(sprintf('
                 INSERT INTO %sobjects
-                    (objectId, data, created, updated) 
-                    VALUES(?, ?, ?, ?)
+                    (objectId, `index`, data, created, updated) 
+                    VALUES(?, ?, ?, ?, ?)
                 ',
             $this->configuration['table_prefix']
         ));
+
         $timestamp = time();
         $query->bind_param(
-            "ssii",
+            "sssii",
             $objectId,
+            $indexName,
             $data,
             $timestamp,
             $timestamp

diff --git a/tests/Functional/Adapter/MySQLAdapterTest.php b/tests/Functional/Adapter/MySQLAdapterTest.php
@@ -36,7 +36,7 @@ public function testNaughtyCharacters($content, $expectations)
         $data = [
             'content' => $content,
         ];
-        $id = 'textObject';
+        $id = uniqid();
         $index->addObject($data, $id, 'someIndex');
 
         foreach ($expectations as $search => $hasResults) {