Rename a variable and add tests for the feature

cakephp · Feb 7, 2016 · 085a892 · 085a892
1 parent d049525
commit 085a892
Show file tree

Hide file tree

Showing 13 changed files with 202 additions and 53 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,8 @@
     "autoload-dev": {
         "psr-4": {
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests",
-            "Migrations\\Test\\": "tests"
+            "Migrations\\Test\\": "tests",
+            "TestBlog\\": "tests/test_app/Plugin/TestBlog/src"
         }
     },
     "suggest": {

diff --git a/src/Shell/Task/MigrationSnapshotTask.php b/src/Shell/Task/MigrationSnapshotTask.php
@@ -246,15 +246,16 @@ public function fetchTableName($className, $pluginName = null)
                 $tables[] = $table->associations()->get($key)->_junctionTableName();
             }
         }
-        $t = $table->table();
-        $splitted = array_reverse(explode('.', $t));
+        $tableName = $table->table();
+        $splitted = array_reverse(explode('.', $tableName, 2));
         if (isset($splitted[1])) {
             $config = ConnectionManager::config($this->connection);
-            if ($config['database'] === $splitted[1]) {
-                $t = $splitted[0];
+            $key = isset($config['schema']) ? 'schema' : 'database';
+            if ($config[$key] === $splitted[1]) {
+                $tableName = $splitted[0];
             }
         }
-        $tables[] = $t;
+        $tables[] = $tableName;
 
         return $tables;
     }

diff --git a/tests/TestCase/Shell/Task/MigrationSnapshotTaskTest.php b/tests/TestCase/Shell/Task/MigrationSnapshotTaskTest.php
@@ -14,6 +14,7 @@
 use Bake\Shell\Task\BakeTemplateTask;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\StringCompareTrait;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Inflector;
@@ -82,13 +83,13 @@ public function testGetTableNames()
     {
         $this->Task->expects($this->any())
             ->method('findTables')
-            ->with('Blog')
+            ->with('TestBlog')
             ->will($this->returnValue(['ArticlesTable.php', 'TagsTable.php']));
 
         $this->Task->method('fetchTableName')
             ->will($this->onConsecutiveCalls(['articles_tags', 'articles'], ['articles_tags', 'tags']));
 
-        $results = $this->Task->getTableNames('Blog');
+        $results = $this->Task->getTableNames('TestBlog');
         $expected = ['articles_tags', 'articles', 'tags'];
         $this->assertEquals(array_values($expected), array_values($results));
     }
@@ -149,15 +150,48 @@ public function testPluginBlog()
         $task = $this->getTaskMock(['in', 'err', 'dispatchShell', '_stop']);
         $task->params['require-table'] = false;
         $task->params['connection'] = 'test';
-        $task->params['plugin'] = 'Blog';
-        $task->plugin = 'Blog';
+        $task->params['plugin'] = 'TestBlog';
+        $task->plugin = 'TestBlog';
 
         $bakeName = $this->getBakeName('TestPluginBlog');
         $result = $task->bake($bakeName);
 
         $this->assertCorrectSnapshot($bakeName, $result);
     }
 
+    /**
+     * Test that using MigrationSnapshotTask::fetchTableName in a Table object class
+     * where the table name is composed with the database name (e.g. mydb.mytable)
+     * will return :
+     * - only the table name if the current connection `database` parameter is the first part
+     * of the table name
+     * - the full string (e.g. mydb.mytable) if the current connection `database` parameter
+     * is not the first part of the table name
+     *
+     * @return void
+     */
+    public function testFetchTableNames()
+    {
+        $task = $this->getTaskMock(['in', 'err']);
+        $expected = ['alternative.special_tags'];
+        $this->assertEquals($expected, $task->fetchTableName('SpecialTagsTable.php', 'TestBlog'));
+
+        ConnectionManager::config('alternative', [
+            'database' => 'alternative'
+        ]);
+        $task->connection = 'alternative';
+        $expected = ['special_tags'];
+        $this->assertEquals($expected, $task->fetchTableName('SpecialTagsTable.php', 'TestBlog'));
+
+        ConnectionManager::drop('alternative');
+        ConnectionManager::config('alternative', [
+            'schema' => 'alternative'
+        ]);
+        $task->connection = 'alternative';
+        $expected = ['special_tags'];
+        $this->assertEquals($expected, $task->fetchTableName('SpecialTagsTable.php', 'TestBlog'));
+    }
+
     /**
      * Get the baked filename based on the current db environment
      *

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -71,4 +71,6 @@
 Plugin::load('Migrations', [
     'path' => dirname(dirname(__FILE__)) . DS,
 ]);
-Plugin::load('Blog');
+Plugin::load('TestBlog', [
+    'path' => ROOT . 'Plugin' . DS . 'TestBlog' . DS,
+]);
diff --git a/tests/comparisons/Migration/pgsql/test_plugin_blog_pgsql.php b/tests/comparisons/Migration/pgsql/test_plugin_blog_pgsql.php
@@ -50,6 +50,41 @@ public function up()
             )
             ->create();
 
+        $table = $this->table('categories');
+        $table
+            ->addColumn('parent_id', 'integer', [
+                'default' => null,
+                'limit' => 10,
+                'null' => true,
+            ])
+            ->addColumn('title', 'string', [
+                'default' => 'NULL::character varying',
+                'limit' => 255,
+                'null' => true,
+            ])
+            ->addColumn('slug', 'string', [
+                'default' => 'NULL::character varying',
+                'limit' => 255,
+                'null' => true,
+            ])
+            ->addColumn('created', 'timestamp', [
+                'default' => null,
+                'limit' => null,
+                'null' => true,
+            ])
+            ->addColumn('modified', 'timestamp', [
+                'default' => null,
+                'limit' => null,
+                'null' => true,
+            ])
+            ->addIndex(
+                [
+                    'slug',
+                ],
+                ['unique' => true]
+            )
+            ->create();
+
         $this->table('articles')
             ->addForeignKey(
                 'category_id',
@@ -84,5 +119,6 @@ public function down()
             );
 
         $this->dropTable('articles');
+        $this->dropTable('categories');
     }
 }
diff --git a/tests/comparisons/Migration/sqlite/test_plugin_blog_sqlite.php b/tests/comparisons/Migration/sqlite/test_plugin_blog_sqlite.php
@@ -49,6 +49,41 @@ public function up()
             )
             ->create();
 
+        $table = $this->table('categories');
+        $table
+            ->addColumn('parent_id', 'integer', [
+                'default' => null,
+                'limit' => 11,
+                'null' => true,
+            ])
+            ->addColumn('title', 'string', [
+                'default' => null,
+                'limit' => 255,
+                'null' => true,
+            ])
+            ->addColumn('slug', 'string', [
+                'default' => null,
+                'limit' => 255,
+                'null' => true,
+            ])
+            ->addColumn('created', 'timestamp', [
+                'default' => null,
+                'limit' => null,
+                'null' => true,
+            ])
+            ->addColumn('modified', 'timestamp', [
+                'default' => null,
+                'limit' => null,
+                'null' => true,
+            ])
+            ->addIndex(
+                [
+                    'slug',
+                ],
+                ['unique' => true]
+            )
+            ->create();
+
         $this->table('articles')
             ->addForeignKey(
                 'category_id',
@@ -83,5 +118,6 @@ public function down()
             );
 
         $this->dropTable('articles');
+        $this->dropTable('categories');
     }
 }
diff --git a/tests/comparisons/Migration/test_plugin_blog.php b/tests/comparisons/Migration/test_plugin_blog.php
@@ -50,6 +50,41 @@ public function up()
             )
             ->create();
 
+        $table = $this->table('categories');
+        $table
+            ->addColumn('parent_id', 'integer', [
+                'default' => null,
+                'limit' => 11,
+                'null' => true,
+            ])
+            ->addColumn('title', 'string', [
+                'default' => null,
+                'limit' => 255,
+                'null' => true,
+            ])
+            ->addColumn('slug', 'string', [
+                'default' => null,
+                'limit' => 255,
+                'null' => true,
+            ])
+            ->addColumn('created', 'timestamp', [
+                'default' => null,
+                'limit' => null,
+                'null' => true,
+            ])
+            ->addColumn('modified', 'timestamp', [
+                'default' => null,
+                'limit' => null,
+                'null' => true,
+            ])
+            ->addIndex(
+                [
+                    'slug',
+                ],
+                ['unique' => true]
+            )
+            ->create();
+
         $this->table('articles')
             ->addForeignKey(
                 'category_id',
@@ -84,5 +119,6 @@ public function down()
             );
 
         $this->dropTable('articles');
+        $this->dropTable('categories');
     }
 }
diff --git a/tests/test_app/Plugin/Blog/src/Model/Entity/Article.php b/tests/test_app/Plugin/Blog/src/Model/Entity/Article.php
diff --git a/tests/test_app/Plugin/Blog/src/Model/Entity/Dog.php b/tests/test_app/Plugin/Blog/src/Model/Entity/Dog.php
diff --git a/...in/Blog/src/Model/Table/ArticlesTable.php → ...estBlog/src/Model/Table/ArticlesTable.php b/...in/Blog/src/Model/Table/ArticlesTable.php → ...estBlog/src/Model/Table/ArticlesTable.php
@@ -1,5 +1,5 @@
 <?php
-namespace Blog\Model\Table;
+namespace TestBlog\Model\Table;
 
 use Cake\ORM\Table;
 

diff --git a/tests/test_app/Plugin/TestBlog/src/Model/Table/CategoriesTable.php b/tests/test_app/Plugin/TestBlog/src/Model/Table/CategoriesTable.php
@@ -0,0 +1,27 @@
+<?php
+namespace TestBlog\Model\Table;
+
+use Cake\ORM\Table;
+
+/**
+ * Articles Model
+ *
+ */
+class CategoriesTable extends Table
+{
+    public function initialize(array $config)
+    {
+        $db = getenv('DB');
+        switch($db) {
+            case 'sqlite':
+                $dbName = ':memory:.';
+                break;
+            case 'mysql':
+            case 'pgsql':
+                $dbName = 'cakephp_test.';
+                break;
+        }
+        $dbName .= 'categories';
+        $this->table($dbName);
+    }
+}
diff --git a/...Plugin/Blog/src/Model/Table/DogsTable.php → ...in/TestBlog/src/Model/Table/DogsTable.php b/...Plugin/Blog/src/Model/Table/DogsTable.php → ...in/TestBlog/src/Model/Table/DogsTable.php
@@ -1,5 +1,5 @@
 <?php
-namespace Blog\Model\Table;
+namespace TestBlog\Model\Table;
 
 use Cake\ORM\Table;
 

diff --git a/tests/test_app/Plugin/TestBlog/src/Model/Table/SpecialTagsTable.php b/tests/test_app/Plugin/TestBlog/src/Model/Table/SpecialTagsTable.php
@@ -0,0 +1,16 @@
+<?php
+namespace TestBlog\Model\Table;
+
+use Cake\ORM\Table;
+
+/**
+ * Articles Model
+ *
+ */
+class SpecialTagsTable extends Table
+{
+    public function initialize(array $config)
+    {
+        $this->table('alternative.special_tags');
+    }
+}