always drop jobs table on version change

vanderbilt-redcap · Nov 30, 2021 · 88080c2 · 88080c2
1 parent f6afc64
commit 88080c2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/AdvancedImport.php b/AdvancedImport.php
@@ -587,13 +587,20 @@ public function redcap_module_system_change_version($version, $old_version)
          */
         $checkColumnarDbInstalled = function() use($old_version){
             $columnarMinimunVersion = 'v1.7.0';
-            $greaterThanMinimumVersion = $this->compareVersions($columnarMinimunVersion, $old_version);
-            if(!$greaterThanMinimumVersion) {
+            $comparison = $this->compareVersions($columnarMinimunVersion, $old_version);
+            if($comparison<0) {
                 $queue = new Queue();
                 $queue->createJobsTable($drop=true);
             };
         };
-        $checkColumnarDbInstalled();
+        /**
+         * reset the jobs table on every update
+         */
+        $resetJobsTable = function() {
+            $queue = new Queue();
+            $queue->createJobsTable($drop=true);
+        };
+        $resetJobsTable();
         $this->checkDbIntegrity($db);
     }
 

diff --git a/app/Helpers/Query.php b/app/Helpers/Query.php
@@ -21,8 +21,14 @@ class Query
      * @var string
      */
     private $query;
+
+    /**
+     *
+     * @var ColumnarDatabase
+     */
+    private $db;
+
     /**
-     * Undocumented function
      *
      * @param ColumnarDatabase $db
      * @param string $query