Changeset 6352 for temp/trunk/data

Timestamp:

2006/10/13 21:36:22 (20 years ago)

Author:

naka

Message:

* empty log message *

Location:

temp/trunk/data

Files:

• class/SC_DbConn.php (modified) (1 diff)
• lib/slib.php (modified) (2 diffs)

temp/trunk/data/class/SC_DbConn.php

@@ -33 +33 @@
                 $this->dsn = $dsn;
             } else {
-                $objDbConn = DB::connect(DEFAULT_DSN, $options);
-                $this->dsn = DEFAULT_DSN;
+                if(defined('DEFAULT_DSN')) {
+                    $objDbConn = DB::connect(DEFAULT_DSN, $options);
+                    $this->dsn = DEFAULT_DSN;
+                } else {
+                    return;
+                }
             }
         }

temp/trunk/data/lib/slib.php

@@ -20 +20 @@
 
 /* ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¡¼¥¸¥ç¥ó½êÆÀ */
-function sfGetDBVersion($dsn = DEFAULT_DSN) {
+function sfGetDBVersion($dsn = "") {
+    if($dsn == "") {
+        if(defined('DEFAULT_DSN')) {
+            $dsn = DEFAULT_DSN;
+        } else {
+            return;
+        }
+    }
+    
     $objQuery = new SC_Query($dsn, true, true);
     list($db_type) = split(":", $dsn);
@@ -36 +44 @@
 
 /* ¥Æ¡¼¥Ö¥ë¤Î¸ºß¥Á¥§¥Ã¥¯ */
-function sfTabaleExists($table_name, $dsn = DEFAULT_DSN) {
+function sfTabaleExists($table_name, $dsn = "") {
+    if($dsn == "") {
+        if(defined('DEFAULT_DSN')) {
+            $dsn = DEFAULT_DSN;
+        } else {
+            return;
+        }
+    }
+    
     $objQuery = new SC_Query($dsn, true, true);
     // Àµ¾ï¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç