Mercurial > hg > fapweb
diff managedb.php @ 616:36e614bf864f
Cosmetics.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 01 Nov 2014 03:49:08 +0200 |
parents | 94b9bf155fdb |
children | 8444fe96120e |
line wrap: on
line diff
--- a/managedb.php Sat Nov 01 02:59:04 2014 +0200 +++ b/managedb.php Sat Nov 01 03:49:08 2014 +0200 @@ -102,8 +102,6 @@ if (($res = stDBFetchSQL($inDB, stDBPrepareSQL($inDB, "SELECT * FROM ".$inTable." WHERE key=%s", $inKey))) !== FALSE) { // Yup, upgrade the data, if we can - echo "."; - if ($res["vtype"] != $data[0]) die("Oops! Data type of '".$key."' does not match in table '".$table.". DB upgrade failed.\n"); @@ -116,7 +114,6 @@ if ($sql === false) { // Normal insertion of default data - echo "+"; $sql = stDBPrepareSQL($outDB, "INSERT INTO ".$table." (key,vtype,".$var.",sdesc) VALUES (%s,%d,".$type.",%s)", $key, $data[0], $data[1], $data[2]); @@ -424,6 +421,7 @@ if (!stMigrateTables($inDB, $outDB, $upgrade, array("settings", "display_vars", "dbmeta"))) exit; + // Set new database version echo "Setting dbVersion.\n"; stSetDBMeta($outDB, "dbVersion", $dbVersion); echo "Upgrade complete.\n";