Changeset 5812 for temp/trunk

Timestamp:

2006/09/25 18:01:41 (20 years ago)

Author:

kakinaka

Message:

blank

Location:

temp/trunk

Files:

• data/class/SC_Query.php (modified) (1 diff)
• html/admin/system/bkup.php (modified) (2 diffs)

temp/trunk/data/class/SC_Query.php

@@ -375 +375 @@
             $seqtable = $table . "_" . $colname . "_seq";
             $sql = "SELECT SETVAL('$seqtable', $data)";
+            $ret = $this->conn->getOne($sql);
         }else if (DB_TYPE == "mysql") {
             $sql = "ALTER TABLE $table AUTO_INCREMENT=$data";
-        }
-        $ret = $this->conn->getOne($sql);
+            $ret = $this->conn->query($sql);
+        }
         
         return $ret;

temp/trunk/html/admin/system/bkup.php

@@ -383 +383 @@
     if ($err) {
         
+        sfprintr("1111111111");
+        
         // ¥È¥é¥ó¥¶¥¯¥·¥ç¥ó³«»Ï
-        //$objQuery->begin();
+        $objQuery->begin();
+        sfprintr("1111111111");
         
         // DB¤ò¥¯¥ê¥¢
         $err = lfDeleteAll($objQuery);
+        sfprintr("1111111111");
         
         // INSERT¼Â¹Ô
         if ($err) $err = lfExeInsertSQL($objQuery, $bkup_dir . "bkup_data.csv");
+        sfprintr("1111111111");
 
         // ¼«Æ°ºÎÈÖ¤ÎÃͤò¥»¥Ã¥È
         if ($err) lfSetAutoInc($objQuery, $bkup_dir . "autoinc_data.csv");
+        sfprintr("1111111111");
 
         if ($err) {
@@ -404 +410 @@
             sfDelFile($bkup_dir);
         }
-        
+        sfprintr("1111111111");
+
         // ¥ê¥¹¥È¥¢À®¸ù¤Ê¤é¥³¥ß¥Ã¥È¼ºÇԤʤé¥í¡¼¥ë¥Ð¥Ã¥¯
         if ($err) {
-            //$objQuery->commit();
+            $objQuery->commit();
             $objPage->restore_msg = "¥ê¥¹¥È¥¢½ªÎ»¤·¤Þ¤·¤¿¡£";
             $objPage->restore_err = true;
         }else{
-            //$objQuery->rollback();
+            $objQuery->rollback();
             $objPage->restore_msg = "¥ê¥¹¥È¥¢¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£";
             $objPage->restore_name = $bkup_name;
             $objPage->restore_err = false;
         }
+        sfprintr("1111111111");
+
     }
 }