Changeset 6262 for temp/trunk

Timestamp:

2006/10/13 13:14:41 (20 years ago)

Author:

naka

Message:

* empty log message *

Location:

temp/trunk

Files:

• data/class/SC_DbConn.php (modified) (1 diff)
• data/lib/slib.php (modified) (1 diff)
• html/install/index.php (modified) (2 diffs)

temp/trunk/data/class/SC_DbConn.php

@@ -20 +20 @@
     var $dsn;
     var $err_disp = true;
-
     
     // ¥³¥ó¥¹¥È¥é¥¯¥¿

temp/trunk/data/lib/slib.php

@@ -20 +20 @@
 // ¥¢¥Ã¥×¥Ç¡¼¥È¤ÇÀ¸À®¤µ¤ì¤¿PHP¤òÆɤ߽Ф¹
 sfLoadUpdateModule();
+
+/* ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¡¼¥¸¥ç¥ó½êÆÀ */
+function sfGetDBVersion($dsn = DEFAULT_DSN) {
+    $objQuery = new SC_Query($dsn);
+    list($db_type) = split(":", $dsn);
+    if($db_type == 'mysql') {
+        $arrRet = $objQuery->getAll("SHOW VARIABLES");
+        foreach($arrRet as $array) {
+            if($array[0] == 'version') {
+                $version = "MySQL " . $array[1];
+                break;
+            }
+        }
+    }
+    if($arrRet['db_type'] == 'pgsql') {
+        $arrRet = $objQuery->getAll("select version()");
+        $arrLine = split(" " , $arrRet[0][0]);
+        $version = $arrLine[0] . " " . $arrLine[1];
+    }
+    return $version;
+}
 
 /* ¥Æ¡¼¥Ö¥ë¤Î¸ºß¥Á¥§¥Ã¥¯ */

temp/trunk/html/install/index.php

@@ -533 +533 @@
         $options['debug'] = PEAR_DB_DEBUG;
         $objDB = DB::connect($dsn, $options);
-        // Àܳ¥¨¥é¡¼
-        if(PEAR::isError($objDB)) {
+        // ÀܳÀ®¸ù
+        if(!PEAR::isError($objDB)) {
+            // ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î¼èÆÀ
+            $objPage->tpl_db_version = sfGetDBVersion($dsn);            
+        } else {
             $objErr->arrErr['all'] = ">> " . $objDB->message . "<br>";
             // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
@@ -540 +543 @@
             $objErr->arrErr['all'].= $arrKey[0] . "<br>";
             gfPrintLog($objDB->userinfo, "./temp/install.log");
-        } else {
-            if($arrRet['db_type'] == 'mysql') {
-                $arrRet = $objDB->getAll("SHOW VARIABLES");
-                foreach($arrRet as $array) {
-                    if($array[0] == 'version') {
-                        $objPage->tpl_db_version = "MySQL " . $array[1];
-                    }
-                }
-            }
-            if($arrRet['db_type'] == 'pgsql') {
-                $arrRet = $objDB->getAll("select version()");
-                $arrLine = split(" " , $arrRet[0][0]);
-                $objPage->tpl_db_version = $arrLine[0] . " " . $arrLine[1];
-            }
         }
     }