Fix reliese#5 - Add missing backticks to database queries

CristianLlanos · CristianLlanos · commit 6cbabebb173c · 2016-11-01T14:39:06.000-05:00
diff --git a/src/Meta/Blueprint.php b/src/Meta/Blueprint.php
@@ -119,22 +119,6 @@ public function hasColumn($name)
         return array_key_exists($name, $this->columns);
     }
 
-    /**
-     * @param $pattern
-     *
-     * @return bool
-     */
-    public function columnIs($pattern)
-    {
-        foreach ($this->columns as $column => $data) {
-            if (Str::is($pattern, $column)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     /**
      * @param string $name
      *
diff --git a/src/Meta/MySql/Schema.php b/src/Meta/MySql/Schema.php
@@ -78,7 +78,7 @@ protected function load()
      */
     protected function fetchTables($schema)
     {
-        $rows = $this->connection->select('SHOW TABLES FROM '.$schema);
+        $rows = $this->connection->select('SHOW TABLES FROM '.$this->wrap($schema));
         $tables = Arr::flatten($rows);
 
         return array_diff($tables, [
@@ -91,7 +91,7 @@ protected function fetchTables($schema)
      */
     protected function fillColumns(Blueprint $blueprint)
     {
-        $rows = $this->connection->select('SHOW FULL COLUMNS FROM '.$blueprint->qualifiedTable());
+        $rows = $this->connection->select('SHOW FULL COLUMNS FROM '.$this->wrap($blueprint->qualifiedTable()));
         foreach ($rows as $column) {
             $blueprint->withColumn(
                 $this->parseColumn($column)
@@ -114,7 +114,7 @@ protected function parseColumn($metadata)
      */
     protected function fillConstraints(Blueprint $blueprint)
     {
-        $row = $this->connection->select('SHOW CREATE TABLE '.$blueprint->qualifiedTable());
+        $row = $this->connection->select('SHOW CREATE TABLE '.$this->wrap($blueprint->qualifiedTable()));
         $row = array_change_key_case($row[0]);
         $sql = $row['create table'];
         $sql = str_replace('`', '', $sql);
@@ -201,6 +201,22 @@ protected function columnize($columns)
         return array_map('trim', explode(',', $columns));
     }
 
+    /**
+     * Wrap within backticks
+     *
+     * @param string $table
+     *
+     * @return string
+     */
+    protected function wrap($table)
+    {
+        $pieces = explode('.', str_replace('`', '', $table));
+
+        return implode('.', array_map(function ($piece) {
+            return "`$piece`";
+        }, $pieces));
+    }
+
     /**
      * @param string $table
      * @param \Reliese\Meta\Blueprint $blueprint
