Changeset 502 for trunk/lib/Version.inc.php

Timestamp:

Dec 30, 2014 10:24:51 PM (9 years ago)

Author:

anonymous

Message:

Many minor fixes during pulso development

File:

• trunk/lib/Version.inc.php (modified) (3 diffs)

trunk/lib/Version.inc.php

@@ -37 +37 @@
  * @version 2.1
  */
-class Version {
+class Version
+{
 
     // A place to keep an object instance for the singleton pattern.
@@ -290 +291 @@
         }
 
-        // Replace current record with specified versioned record.
+        // Disable foreign_key_checks to prevent ON DELETE triggers or restrictions.
+        $db->query("SET SESSION foreign_key_checks = 0");
+        // Replace current record with specified versioned record. Consider converting this SQL to use INSERT 
 ON DUPLICATE KEY UPDATE 

         $db->query("
-            REPLACE INTO " . $record['record_table'] . " (
+        REPLACE INTO " . $record['record_table'] . " (
                 $replace_keys
             ) VALUES (
                 $replace_values
-            )
-        ");
+            );
+        ");
+        // Re-enable foreign_key_checks.
+        $db->query("SET SESSION foreign_key_checks = 1");
 
         return $record;
@@ -468 +473 @@
     {
         $db =& DB::getInstance();
-
-        $this->initDB();
+        $app =& App::getInstance();
+
+        $this->initDB();
+
+        if (!$record_table || !$record_key || !$record_val) {
+            $app->logMsg(sprintf('Invalid current version args: %s, %s, %s.', $record_table, $record_key, $record_val), LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
 
         $qid = $db->query("