Changeset 20732 for branches/version-2_5-dev
- Timestamp:
- 2011/03/20 01:17:08 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20731
- bzr:committer:
- Kentaro Ohkouchi <nanasess@fsm.ne.jp>
- 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:
nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- nanasess@fsm.ne.jp-20110319161703-fhnjmrfrfc17srj3
- 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 nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui
data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui
data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui
data/class/helper/SC_Helper_DB.php nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui
data/class/pages/admin/LC_Page_Admin_Home.php nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui
data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui
data/class_extends/db_extends/SC_DB_DBFactory_Ex.php nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui
html/install/index.php nanasess@fsm.ne.jp-20110319161532-vi3cme6l5m7hfiui- 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
- Location:
- branches/version-2_5-dev
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/class/db/SC_DB_DBFactory.php
r20538 r20732 38 38 * DB_TYPE に応じた DBFactory インスタンスを生成する. 39 39 * 40 * @param string $db_type 任意のインスタンスを返したい場合は DB_TYPE 文字列を指定 40 41 * @return mixed DBFactory インスタンス 41 42 */ 42 function getInstance( ) {43 switch ( DB_TYPE) {43 function getInstance($db_type = DB_TYPE) { 44 switch ($db_type) { 44 45 case 'mysql': 45 46 return new SC_DB_DBFactory_MYSQL(); -
branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
r20541 r20732 48 48 */ 49 49 function sfGetDBVersion($dsn = "") { 50 $objQuery =& SC_Query_Ex::getSingletonInstance( );50 $objQuery =& SC_Query_Ex::getSingletonInstance($dsn); 51 51 $val = $objQuery->getOne("select version()"); 52 52 return "MySQL " . $val; -
branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
r20562 r20732 45 45 */ 46 46 function sfGetDBVersion($dsn = "") { 47 $objQuery =& SC_Query_Ex::getSingletonInstance( );47 $objQuery =& SC_Query_Ex::getSingletonInstance($dsn); 48 48 $val = $objQuery->getOne("select version()"); 49 49 $arrLine = explode(" " , $val); -
branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
r20729 r20732 49 49 50 50 /** 51 * データベースのバージョンを所得する.52 *53 * @param string $dsn データソース名54 * @return string データベースのバージョン55 */56 function sfGetDBVersion($dsn = "") {57 $dbFactory = SC_DB_DBFactory_Ex::getInstance();58 return $dbFactory->sfGetDBVersion($dsn);59 }60 61 /**62 51 * カラムの存在チェックと作成を行う. 63 52 * -
branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
r20540 r20732 131 131 */ 132 132 function lfGetDBVersion() { 133 $ objDb = new SC_Helper_DB_Ex();134 return $ objDb->sfGetDBVersion();133 $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 134 return $dbFactory->sfGetDBVersion(); 135 135 } 136 136 -
branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_SiteCheck.php
r18701 r20732 62 62 } 63 63 64 $ objDB = new SC_Helper_DB;64 $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 65 65 $arrSystemInfo = array( 66 66 'eccube_version' => ECCUBE_VERSION, 67 67 'php_version' => phpversion(), 68 'db_version' => $ objDB->sfGetDBVersion()68 'db_version' => $dbFactory->sfGetDBVersion() 69 69 ); 70 70 $objJson->setSuccess($arrSystemInfo); -
branches/version-2_5-dev/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php
r20538 r20732 44 44 * DB_TYPE に応じた DBFactory インスタンスを生成する. 45 45 * 46 * @param string $db_type 任意のインスタンスを返したい場合は DB_TYPE 文字列を指定 46 47 * @return mixed DBFactory インスタンス 47 48 */ 48 function getInstance( ) {49 switch ( DB_TYPE) {49 function getInstance($db_type = DB_TYPE) { 50 switch ($db_type) { 50 51 case 'mysql': 51 52 return new SC_DB_DBFactory_MYSQL_Ex(); -
branches/version-2_5-dev/html/install/index.php
r20730 r20732 520 520 $objPage->tpl_cube_ver = ECCUBE_VERSION; 521 521 $objPage->tpl_php_ver = phpversion(); 522 $dbFactory = SC_DB_DBFactory_Ex::getInstance( );522 $dbFactory = SC_DB_DBFactory_Ex::getInstance($arrDbParam['db_type']); 523 523 $objPage->tpl_db_ver = $dbFactory->sfGetDBVersion($dsn); 524 524 $objPage->tpl_db_skip = $_POST['db_skip']; … … 592 592 } 593 593 $objPage->tpl_sslurl = $secure_url; 594 594 //EC-CUBEオフィシャルサイトからのお知らせURL 595 595 $objPage->install_info_url = INSTALL_INFO_URL; 596 596 return $objPage; … … 756 756 // 接続成功 757 757 if(!PEAR::isError($objDB)) { 758 $dbFactory = SC_DB_DBFactory_Ex::getInstance( );758 $dbFactory = SC_DB_DBFactory_Ex::getInstance($arrRet['db_type']); 759 759 // データベースバージョン情報の取得 760 760 $objPage->tpl_db_version = $dbFactory->sfGetDBVersion($dsn);
Note: See TracChangeset
for help on using the changeset viewer.