From f7dad085d19c8b61c5f67596f65ec785e740a8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Oct 2012 11:13:08 +0200 Subject: [PATCH] Test for getting columns --- libraries/dbi/dummy.lib.php | 4 ++-- test/classes/PMA_Table_test.php | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index f41786b4fd..15c6612c94 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -214,11 +214,11 @@ $GLOBALS['dummy_queries'] = array( 'result' => array(), ), array( - 'query' => 'RENAME TABLE `table1`.`pma_test` TO `table1`.`table3`;', + 'query' => 'RENAME TABLE `pma_test`.`table1` TO `pma_test`.`table3`;', 'result' => array(), ), array( - 'query' => 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= \'table1\' AND EVENT_OBJECT_TABLE = \'pma_test\';', + 'query' => 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= \'pma_test\' AND EVENT_OBJECT_TABLE = \'table1\';', 'result' => array(), ), diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php index 6f153f7442..78ae2c4888 100644 --- a/test/classes/PMA_Table_test.php +++ b/test/classes/PMA_Table_test.php @@ -54,7 +54,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase */ public function testCreate() { - $table = new PMA_Table('pma_test', 'table1'); + $table = new PMA_Table('table1', 'pma_test'); $this->assertInstanceOf('PMA_Table', $table); } @@ -65,9 +65,23 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase */ public function testRename() { - $table = new PMA_Table('pma_test', 'table1'); + $table = new PMA_Table('table1', 'pma_test'); $table->rename('table3'); $this->assertEquals('table3', $table->getName()); } + + /** + * Test getting columns + * + * @return void + */ + public function testColumns() + { + $table = new PMA_Table('table1', 'pma_test'); + $this->assertEquals( + array('`pma_test`.`table1`.`i`', '`pma_test`.`table1`.`o`'), + $table->getColumns() + ); + } }