Fixing issue with datastore_mysql_import existing tables (#3972)

modules/common/src/Storage/AbstractDatabaseTable.php

@@ -237,7 +237,7 @@ public function query(Query $query, string $alias = 't', $fetch = TRUE) {
   /**
    * Create a minimal error message that does not leak database information.
    */
-  private function sanitizedErrorMessage(string $unsanitizedMessage) {
+  protected function sanitizedErrorMessage(string $unsanitizedMessage) {
     // Insert portions of exception messages you want caught here.
     $messages = [
       // Portion of the message => User friendly message.

modules/datastore/modules/datastore_mysql_import/src/Storage/MySqlDatabaseTable.php

@@ -2,6 +2,9 @@
 
 namespace Drupal\datastore_mysql_import\Storage;
 
+use Drupal\common\Storage\Query;
+use Drupal\common\Storage\SelectFactory;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\datastore\Storage\DatabaseTable;
 
 /**
@@ -23,8 +26,40 @@ protected function setTable() {
       $this->tableCreate($this->getTableName(), $this->schema);
     }
     else {
-      throw new \Exception("Could not instantiate the table due to a lack of schema.");
+      throw new \Exception('Could not instantiate the table due to a lack of schema.');
     }
   }
 
+  /**
+   * Run a query on the database table.
+   *
+   * @param \Drupal\common\Storage\Query $query
+   *   Query object.
+   * @param string $alias
+   *   (Optional) alias for primary table.
+   * @param bool $fetch
+   *   Fetch the rows if true, just return the result statement if not.
+   *
+   * @return array|\Drupal\Core\Database\StatementInterface
+   *   Array of results if $fetch is true, otherwise result of
+   *   Select::execute() (prepared Statement object or null).
+   */
+  public function query(Query $query, string $alias = 't', $fetch = TRUE) {
+    if (!$this->tableExist($this->getTableName())) {
+      throw new \Exception('Could not instantiate the table due to a lack of schema.');
+    }
+    $query->collection = $this->getTableName();
+    $selectFactory = new SelectFactory($this->connection, $alias);
+    $db_query = $selectFactory->create($query);
+
+    try {
+      $result = $db_query->execute();
+    }
+    catch (DatabaseExceptionWrapper $e) {
+      throw new \Exception($this->sanitizedErrorMessage($e->getMessage()));
+    }
+
+    return $fetch ? $result->fetchAll() : $result;
+  }
+
 }

modules/datastore/modules/datastore_mysql_import/tests/files/catalog-step-1.json

@@ -0,0 +1,28 @@
+{
+  "dataset": [
+    {
+      "accessLevel": "public",
+      "description": "Description #1",
+      "identifier": "1",
+      "modified": "2019-12-31",
+      "title": "One",
+      "keyword": ["keyword"]
+    },
+    {
+      "accessLevel": "public",
+      "description": "Description #2",
+      "identifier": "2",
+      "modified": "2019-12-31",
+      "title": "Two",
+      "keyword": ["keyword"]
+    },
+    {
+      "accessLevel": "public",
+      "description": "Description #3",
+      "identifier": "3",
+      "modified": "2019-12-31",
+      "title": "Three",
+      "keyword": ["keyword"]
+    }
+  ]
+}

modules/datastore/modules/datastore_mysql_import/tests/files/catalog-step-2.json

@@ -0,0 +1,28 @@
+{
+  "dataset": [
+    {
+      "accessLevel": "public",
+      "description": "Description #1",
+      "identifier": "1",
+      "modified": "2019-12-31",
+      "title": "One",
+      "keyword": ["keyword"]
+    },
+    {
+      "accessLevel": "public",
+      "description": "Description #2",
+      "identifier": "2",
+      "modified": "2019-12-31",
+      "title": "Two updated",
+      "keyword": ["keyword"]
+    },
+    {
+      "accessLevel": "public",
+      "description": "Description #4",
+      "identifier": "4",
+      "modified": "2019-12-31",
+      "title": "Four",
+      "keyword": ["keyword"]
+    }
+  ]
+}