Changeset 18790 for branches/version-2_5-dev/test

Timestamp:

2010/08/24 14:58:32 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100820090626-dkyj2ngdh7vklaow

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/db/SC_DB_DBFactory.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2FSC_DB_DBFactory.php
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_MYSQL.php
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_PGSQL.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/helper/SC_Helper_Session.php 15277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Session.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
test/class/SC_Query_Test.php sc_query_test.php-20100803024127-ljzonih8f5jpan9o-1
test/class/helper/SC_Helper_DB_Test.php 15242@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2Fclass%2Fhelper%2FSC_Helper_DB_Test.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20100824055828-2oy1qb3wcp85i76l

bzr:revno:

2273

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-parents:

data/class/SC_Query.php ohkouchi@loop-az.jp-20100819104758-beubop5hq0pwdqhx
data/class/helper/SC_Helper_Session.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
html/install/index.php ohkouchi@loop-az.jp-20100819104758-beubop5hq0pwdqhx
test/class/SC_Query_Test.php ohkouchi@loop-az.jp-20100803111301-u8ph4za35y4il0dh
test/class/helper/SC_Helper_DB_Test.php ohkouchi@loop-az.jp-20100726081655-tqxqwy02bxqhswcu

bzr:timestamp:

2010-08-24 14:58:28.038000107 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-08-24T05:58:28.038000Z

Message:

#801 の改善に伴い MDB2 の関数に置き替えと, 未使用関数の削除

• SC_Query
  • get_auto_increment() を削除
  • listSequences() を追加
  • listTables() を追加
  • listTableFields() を追加
  • listTableIndexes() を追加
• SC_DB_DBFactory
  • getTableExistsSql() を削除
  • getTableIndex() を削除
  • createTableIndex() を削除
  • sfGetColumnList(), findTableNames() に @deprecated コメント追加
• SC_Helper_DB
  • sfTabaleExists() を削除
  • sfIndexExists() を削除
  • 削除した関数の使用箇所を修正
• SC_Helper_Session
  • sfTabaleExists() を使用していた箇所の修正
• html/install/index.php
  • sfTabaleExists() を使用していた箇所の修正

Location:

branches/version-2_5-dev/test/class

Files:

• SC_Query_Test.php (modified) (3 diffs)
• helper/SC_Helper_DB_Test.php (modified) (1 diff)

branches/version-2_5-dev/test/class/SC_Query_Test.php

@@ -48 +48 @@
     function tearDown() {
         $this->objQuery->rollback();
+        // MySQL では CREATE TABLE がロールバックされないので DROP TABLE を行う
+        $this->dropTestTable();
         $this->objQuery = null;
     }
@@ -217 +219 @@
 
         $this->verify();
+    }
+
+    function testListTables() {
+        $tables = $this->objQuery->listTables();
+        $this->assertTrue(in_array("mtb_zip", $tables));
+    }
+
+    function testListSequences() {
+        $sequences = $this->objQuery->listSequences();
+        $this->assertTrue(in_array("dtb_products_product_id", $sequences));
+    }
+
+    function testListTableFields() {
+        $this->expected = array("id", "name", "rank", "remarks");
+        $this->actual = $this->objQuery->listTableFields("mtb_constants");
+        $this->verify();
+    }
+
+    function testListTableIndexes() {
+        $indexes = $this->objQuery->listTableIndexes("dtb_mobile_kara_mail");
+        $this->assertTrue(in_array("dtb_mobile_kara_mail_create_date_key", $indexes));
     }
 
@@ -229 +252 @@
     }
 
+    function dropTestTable() {
+        return $this->objQuery->query("DROP TABLE test_table");
+    }
+
     function setTestData($column1, $column2, $column3) {
         $fields_values = array($column1, $column2, $column3);

branches/version-2_5-dev/test/class/helper/SC_Helper_DB_Test.php

@@ -36 +36 @@
 
     /**
-     * sfTableExists() のテストケース.
-     */
-    function testSfTableExists() {
-        $objDb = new SC_Helper_DB_Ex();
-        $this->assertEquals(true, $objDb->sfTabaleExists("mtb_zip"));
-    }
-
-    /**
      * sfColumnExists() のテストケース.
      */