Changeset 20732 for branches/version-2_5-dev/data/class/db/dbfactory

Timestamp:

2011/03/20 01:17:08 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20731

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

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/pages/admin/LC_Page_Admin_Home.php 15287@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin_Home.php
data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php 16539@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fupgrade%2FLC_Page_Upgrade_SiteCheck.php
data/class_extends/db_extends/SC_DB_DBFactory_Ex.php 16326@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass_extends%2Fdb_extends%2FSC_DB_DBFactory_Ex.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

3446

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/db/SC_DB_DBFactory.php [email protected]
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php [email protected]
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/class/pages/admin/LC_Page_Admin_Home.php [email protected]
data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php [email protected]
data/class_extends/db_extends/SC_DB_DBFactory_Ex.php [email protected]
html/install/index.php [email protected]

bzr:timestamp:

2011-03-20 01:17:03.464999914 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-03-19T16:17:03.465000Z

Message:

#957(再インストール時、インストール画面「データベースの初期化」で旧DBMSを表示)

• 再インストール前の data/config/config.php の DB_TYPE を参照していたのを修正
• SC_DB_DBFactory::getInstance() に DB_TYPE を渡して任意のインスタンスを返せるよう修正
• SC_DB_DBFactory::sfGetDBVersion() で, 引数の DSN が無効になっていた不具合を修正
• SC_Helper_DB::sfGetDBVersion() は冗長だったため削除

Location:

branches/version-2_5-dev/data/class/db/dbfactory

Files:

• SC_DB_DBFactory_MYSQL.php (modified) (1 diff)
• SC_DB_DBFactory_PGSQL.php (modified) (1 diff)

branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

@@ -48 +48 @@
      */
     function sfGetDBVersion($dsn = "") {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
         $val = $objQuery->getOne("select version()");
         return "MySQL " . $val;

branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php

@@ -45 +45 @@
      */
     function sfGetDBVersion($dsn = "") {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $objQuery =& SC_Query_Ex::getSingletonInstance($dsn);
         $val = $objQuery->getOne("select version()");
         $arrLine = explode(" " , $val);