Changeset 6266

Timestamp:

2006/10/13 13:22:44 (20 years ago)

Author:

naka

Message:

* empty log message *

Location:

temp/trunk

Files:

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

temp/trunk/data/class/SC_DbConn.php

@@ -22 +22 @@
     
     // ¥³¥ó¥¹¥È¥é¥¯¥¿
-    function SC_DbConn($dsn = "", $err_disp = true){
+    function SC_DbConn($dsn = "", $err_disp = true, $new = false){
         global $objDbConn;
         
         // Debug¥â¡¼¥É»ØÄê
         $options['debug'] = PEAR_DB_DEBUG;
-        // ´û¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤ÏÀܳ¤·¤Ê¤¤
-        if(!isset($objDbConn->connection)) {
+        // ´û¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤ÈºÆÀܳ¤Ê¤·¤Î¾ì¹ç¤ÏÀܳ¤·¤Ê¤¤
+        if(!isset($objDbConn->connection) && !$new) {
             if($dsn != "") {
                 $objDbConn = DB::connect($dsn, $options);

temp/trunk/data/class/SC_Query.php

@@ -12 +12 @@
     
     // ¥³¥ó¥¹¥È¥é¥¯¥¿
-    function SC_Query($dsn = "", $err_disp = true) {
-        $this->conn = new SC_DBconn($dsn, $err_disp);
+    /*
+        $err_disp:¥¨¥é¡¼É½¼¨¤ò¹Ô¤¦¤«
+        $new¡§ºÆÀܳ¤ò¹Ô¤¦¤«
+     */
+    function SC_Query($dsn = "", $err_disp = true, $new = false) {
+        $this->conn = new SC_DBconn($dsn, $err_disp, $new);
         $this->where = "";
         return $this->conn;

temp/trunk/data/lib/slib.php

@@ -26 +26 @@
     list($db_type) = split(":", $dsn);
     if($db_type == 'mysql') {
-        $arrRet = $objQuery->getAll("SHOW VARIABLES");
+        $arrRet = $objQuery->getAll("select version()");
         
         sfPrintR($arrRet);

temp/trunk/html/install/index.php

@@ -83 +83 @@
     $arrRet =  $objDBParam->getHashArray();
     $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
-    
-    global $objDbConn;
-    unset($objDbConn);
-    
     /*
         ¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×Åù¤ÇÄɲåơ¼¥Ö¥ë¤¬È¯À¸¤·¤¿ºÝ¤Ïµ­ºÜ¤¹¤ë