devel: bump db version using date from filename (we dont need repeata…

…ble work to be done in upgradedb.php), also use transactions for all upgrade scripts
chilek · Aug 23, 2022 · 4d6a912 · 4d6a912
1 parent c11de6f
commit 4d6a912
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/devel/dbinfo_version_bump.sh b/devel/dbinfo_version_bump.sh
@@ -29,6 +29,6 @@ sed -i -e "s/^define('DBVERSION', '\([0-9]\+\)');/define('DBVERSION', '$1');/g"
 
 for dbdriver in mysql postgres; do
 	if [ ! -f "${LMSDIR}/lib/upgradedb/${dbdriver}.$1.php" ]; then
-		sed -e "s/%version%/$1/g" ${CWD}/upgradedb-template.php >${LMSDIR}/lib/upgradedb/${dbdriver}.$1.php
+		cp ${CWD}/upgradedb-template.php ${LMSDIR}/lib/upgradedb/${dbdriver}.$1.php
 	fi
 done
diff --git a/devel/upgradedb-template.php b/devel/upgradedb-template.php
@@ -20,9 +20,3 @@
  *  USA.
  *
  */
-
-$this->BeginTrans();
-
-$this->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('%version%', 'dbversion'));
-
-$this->CommitTrans();
diff --git a/lib/LMSDB_common.class.php b/lib/LMSDB_common.class.php
@@ -773,7 +773,22 @@ public function UpgradeDb($dbver = DBVERSION, $pluginclass = null, $libdir = nul
                     if (!empty($pendingupgrades)) {
                         sort($pendingupgrades);
                         foreach ($pendingupgrades as $upgrade) {
-                            include($libdir . DIRECTORY_SEPARATOR . 'upgradedb' . DIRECTORY_SEPARATOR . $filename_prefix . '.' . $upgrade . '.php');
+                            // from 2022-08-22 we don't need to add UPDATE
+                            // and dbinfo query and transactions Start/Commit
+                            if ($upgrade >= 2022082200) {
+                                $this->BeginTrans();
+                                include($libdir . DIRECTORY_SEPARATOR . 'upgradedb'
+                                    . DIRECTORY_SEPARATOR . $filename_prefix . '.' . $upgrade . '.php');
+                                $this->Execute(
+                                    'UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?',
+                                    array($upgrade, 'dbversion')
+                                );
+                                $this->CommitTrans();
+                            } else {
+                                include($libdir . DIRECTORY_SEPARATOR . 'upgradedb'
+                                    . DIRECTORY_SEPARATOR . $filename_prefix . '.' . $upgrade . '.php');
+                            }
+
                             if (empty($this->errors)) {
                                 $lastupgrade = $upgrade;
                             } else {