fapweb: managedb.php annotate

annotate managedb.php @ 555:206196b610fd

Move site specific things to dbdefs.inc.php

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 19 Dec 2013 21:58:52 +0200
parents	f13e7a513db1
children	ed2247111fdd

rev	line source
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 #!/usr/bin/php
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 <?
175 8df523e6326a User require_once instead of require. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	3 require_once "mconfig.inc.php";
8df523e6326a User require_once instead of require. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	4 require_once "msite.inc.php";
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	5 require_once "dbdefs.inc.php";
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6
479 86ee2b42a995 Move CLI helper functions to msitegen, again. Matti Hamalainen <ccr@tnsp.org> parents: 426 diff changeset	7 stCheckCLIExec();
50 184a4188555c Move CLI helper functions to createdb.php, as they are now only used there. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	8
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	9
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	10 $currVersion = -1;
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	11 $dbMetaData = array(
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	12 "dbVersion" => array(VT_INT, $dbVersion, "Database version"),
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	13 );
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	14
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	15 $sqlTables["dbmeta"] = array(
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	16 array("key" , "VARCHAR(32)", "PRIMARY KEY"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	17 array("vtype" , "INT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	18 array("vstr" , "VARCHAR(128)"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	19 array("vtext" , "TEXT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	20 array("vint" , "INT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	21 array("sdesc" , "VARCHAR(128)"),
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	24
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	25
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 //
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	27 // Helper functions
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 //
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	29 function stGetTableSchema($dbh, $data)
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	30 {
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	31 $res = array();
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	32 $driver = $dbh->getAttribute(PDO::ATTR_DRIVER_NAME);
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	33
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	34 foreach ($data as $col)
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	35 {
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	36 $tmp = array();
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	37
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	38 switch ($driver)
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	39 {
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	40 case "pgsql":
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	41 foreach ($col as $elem)
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	42 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	43 // For Postgres, use SERIAL for autoincrement
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	44 if ($elem == "AUTOINCREMENT")
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	45 $tmp[1] = "SERIAL";
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	46 else
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	47 $tmp[] = $elem;
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	48 }
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	49 break;
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	50
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	51 case "mysql":
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	52 foreach ($col as $elem)
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	53 {
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	54 if ($elem != "AUTOINCREMENT")
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	55 $tmp[] = "AUTO_INCREMENT";
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	56 else
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	57 $tmp[] = $elem;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	58 }
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	59 break;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	60
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	61 case "sqlite":
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	62 $tmp = $col;
518 af2f39a1dd79 Oops, had a missing semicolon .. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	63 break;
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	64
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	65 default:
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	66 die("Don't know how to handle PDO driver '".$driver."' yet.\n");
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	67 }
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	68
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	69 $res[] = implode(" ", $tmp);
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	70 }
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	71
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	72 return implode(", ", $res);
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	73 }
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	74
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	75
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	76 function stCreateOneTable($dbh, $name, $schema)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	77 {
549 e5732b25c839 Comment out a debug print. Matti Hamalainen <ccr@tnsp.org> parents: 542 diff changeset	78 // echo "CREATE TABLE ".$name ." (".$schema.")\n";
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	79 return (stDBExecSQL($dbh, "CREATE TABLE ".$name." (".$schema.")") !== FALSE) ? TRUE : FALSE;
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	80 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	81
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	82
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	83 function stCreateTables($dbh, $upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 global $sqlTables;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 echo "Creating tables...\n";
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	87 foreach ($sqlTables as $name => $schemaData)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 echo " - '".$name."'\n";
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	90 stDBExecSQL($dbh, "DROP TABLE IF EXISTS ".$name);
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	91 if (!stCreateOneTable($dbh, $name, stGetTableSchema($dbh, $schemaData)) && !$upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 return FALSE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 return TRUE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	98 function stUpgradeMap($type, $name)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	99 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	100 global $upgradeMappings, $currVersion, $dbVersion;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	101
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	102 $converted = FALSE;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	103 $tmpName = $name;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	104
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	105 for ($ver = $currVersion; $ver <= $dbVersion; $ver++)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	106 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	107 if (isset($upgradeMappings[$ver]) &&
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	108 isset($upgradeMappings[$ver][$tmpName]) &&
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	109 isset($upgradeMappings[$ver][$tmpName][$type]))
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	110 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	111 $tmpName = $upgradeMappings[$ver][$tmpName][$type];
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	112 $converted = TRUE;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	113 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	114 }
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	115
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	116 if ($converted)
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	117 return $tmpName;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	118 else
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	119 switch ($type)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	120 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	121 case "table": return $name;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	122 case "key": return $name;
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	123 default: die("Invalid upgrade type '".$type."'.\n");
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	124 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	125 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	126
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	127
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	128 function stAddSettings($inDB, $outDB, $settings, $table, $upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 {
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	130 echo ($upgrade ? "Adding settings to" : "Upgrading settings in")." '".$table."' table.";
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	131
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	132 $status = TRUE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	133 stDBExecSQL($outDB, "BEGIN TRANSACTION");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	134
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	135 foreach ($settings as $key => $data)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 {
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	137 $sql = false;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	138
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	139 // Get setting type
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	140 switch ($data[0])
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 case VT_TEXT: $type = "%s"; $var = "vtext"; break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 case VT_STR: $type = "%s"; $var = "vstr"; break;
72 63a6caf59e5c Fix creation of boolean settings, and add '%b' formatter into stPrepareSQL(). Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	144 case VT_BOOL: $type = "%b"; $var = "vint"; break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 case VT_INT: $type = "%d"; $var = "vint"; break;
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	146 default: die("Invalid type in default settings '".$key."', type=".$data[0]."\n");
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	149 // Check if we are upgrading
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	150 if ($upgrade)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	151 {
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	152 // Map the key, in case the name has changed
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	153 $inKey = stUpgradeMap("key", $key);
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	154 $inTable = stUpgradeMap("table", $table);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	155
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	156 if (($res = stDBFetchSQL($inDB, stDBPrepareSQL($inDB, "SELECT * FROM ".$inTable." WHERE key=%s", $inKey))) !== FALSE)
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	157 {
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	158 // Yup, upgrade the data, if we can
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	159 echo ".";
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	160
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	161 if ($res["vtype"] != $data[0])
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	162 die("Oops! Data type of '".$key."' does not match in table '".$table.". DB upgrade failed.\n");
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	163
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	164 $sql = stDBPrepareSQL($outDB,
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	165 "INSERT INTO ".$table." (key,vtype,".$var.",sdesc) VALUES (%s,%d,".$type.",%s)",
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	166 $key, $data[0], $res[$var], $data[2]);
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	167 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	168 }
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	169
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	170 if ($sql === false)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	171 {
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	172 // Normal insertion of default data
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	173 echo "+";
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	174 $sql = stDBPrepareSQL($outDB,
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	175 "INSERT INTO ".$table." (key,vtype,".$var.",sdesc) VALUES (%s,%d,".$type.",%s)",
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	176 $key, $data[0], $data[1], $data[2]);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	177 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	178
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	179 if (stDBExecSQL($outDB, $sql) === FALSE)
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	180 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	181 $status = FALSE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	182 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	183 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	184 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	185 echo "\n";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	186
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	187 stDBExecSQL($outDB, "COMMIT");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	188 return $status;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	189 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	190
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	191
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	192 function stAddTestData($outDB)
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	193 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	194 global $siteTestData;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	195
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	196 echo "Adding test data.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	197
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	198 $status = TRUE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	199 stDBExecSQL($outDB, "BEGIN TRANSACTION");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	200
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	201 foreach ($siteTestData as $table => $data)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	202 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	203 echo " - ".$table."...\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	204 if (count($data) >= 3)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	205 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	206 for ($n = 2; $n < count($data); $n++)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	207 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	208 $arr = array_merge(
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	209 array($outDB, "INSERT INTO ".$table." (".$data[0].") VALUES (".$data[1].")"),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	210 $data[$n]);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	211
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	212 $sql = call_user_func_array('stDBPrepareSQL', $arr);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	213 if (stDBExecSQL($outDB, $sql) === false)
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	214 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	215 $status = false;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	216 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	217 }
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	218 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	219 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	220 else
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	221 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	222 echo " Invalid table / data definition.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	223 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	224 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	225
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	226 stDBExecSQL($outDB, "COMMIT");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	227 return $status;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	228 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	229
499 408effd4e9ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	230
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	231 function stGetSQLTypeParam($dbh, $def, $value)
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	232 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	233 switch (substr($def, 0, 3))
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	234 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	235 case "INT":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	236 return intval($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	237
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	238 case "VAR":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	239 case "TEX":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	240 return $dbh->quote($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	241
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	242 default: die("Unknown type ".$col[1].".\n");
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	243 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	244 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	245
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	246
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	247 function stMigrateTables($inDB, $outDB, $upgrade, $excluded)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	248 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	249 global $sqlTables;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	250
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	251 echo "Migrating tables...\n";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	252 $status = TRUE;
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	253 $dbName = $outDB->getAttribute(PDO::ATTR_DRIVER_NAME);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	254 stDBExecSQL($outDB, "BEGIN TRANSACTION");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	255
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	256 foreach ($sqlTables as $table => $schema)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	257 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	258 // Do not migrate excluded tables (or excluded tables with old names)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	259 $sequences = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	260 $inTable = $upgrade ? stUpgradeMap("table", $table) : $table;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	261 if (in_array($inTable, $excluded) \|\| in_array($table, $excluded))
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	262 continue;
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	263
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	264 // Process each row of the input table
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	265 echo " - '".$table."' ";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	266 foreach (stDBExecSQL($inDB, "SELECT * FROM ".$inTable) as $row)
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	267 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	268 // Convert to new schema, as needed
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	269 $avals = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	270 $acols = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	271
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	272 foreach ($schema as $col)
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	273 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	274 // If input has schema column, add it to output
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	275 if (isset($row[$col[0]]))
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	276 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	277 $avals[] = stGetSQLTypeParam($outDB, $col[1], $row[$col[0]]);
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	278 $acols[] = $col[0];
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	279 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	280
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	281 // If the column should have autoincrement, add it to sequences
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	282 if (in_array("AUTOINCREMENT", $col))
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	283 $sequences[] = $col[0];
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	284 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	285
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	286 $sql = "INSERT INTO ".$table." (".implode(",", $acols).") VALUES (".implode(",", $avals).")";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	287 if (stDBExecSQL($outDB, $sql) === false)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	288 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	289 $status = FALSE;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	290 break;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	291 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	292 echo ".";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	293 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	294
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	295 // Perform some specialities here
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	296 switch ($dbName)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	297 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	298 case "pgsql":
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	299 // For PostgreSQL we need to update sequences
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	300 foreach ($sequences as $seq)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	301 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	302 if (($max_id = stDBFetchSQLColumn($outDB, "SELECT MAX(".$seq.") FROM ".$table)) !== false &&
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	303 ($seq_id = stDBFetchSQLColumn($outDB, "SELECT nextval('".$table."_".$seq."_seq')")) !== false &&
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	304 ($seq_id <= $max_id))
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	305 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	306 echo "SEQFIX";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	307 stDBExecSQL($outDB, "SELECT setval('".$table."_".$seq."_seq', ".$max_id.")");
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	308 }
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	309 }
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	310 break;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	311 }
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	312
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	313 echo "\n";
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	314 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	315
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	316 stDBExecSQL($outDB, "COMMIT");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	317
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	318 return $status;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	319 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	320
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	321
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	322 function stSetDBPermissions($spec)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	323 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	324 if (substr($spec, 0, 7) == "sqlite:")
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	325 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	326 $filename = substr($spec, 7);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	327 echo
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	328 "NOTICE! It seems you have SQLite database in use, changing permission ".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	329 "of the target file '".$filename."' to 0600, for security. You may have to ".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	330 "loosen up that for the things to actually work, but be careful. Having your ".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	331 "database world-readable in the web is NOT good.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	332
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	333 if (chmod($filename, 0600) === FALSE)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	334 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	335 echo "ERROR! Could not set permissions of '".$filename."!\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	336 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	337 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	338 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	339
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	340
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	341 //
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	342 // Main program starts
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	343 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 if ($argc < 2)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 {
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	346 echo
529 ddbc84031a7b Rename createdb.php to managedb.php Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	347 "ManageDB - Manage FAPWeb SQL database\n".
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	348 "(C) Copyright 2012-2013 ccr/TNSP\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	349 "\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	350 "Usage: ".$argv[0]." <mode> [args]\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 "Where mode is one of following:\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	353 " new <dbspec> Create a new database with given PDO spec\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354 " or default to the one in mconfig.inc.php\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	356 " test <dbspec> Like new, but add initial test data.\n".
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	357 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	358 " upgrade <input_dbspec> <output_dbspec>\n".
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	359 " Upgrade current database, if possible.\n".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	360 " Output to new database (DO NOT USE SAME as current!)\n".
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	361 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	362 " migrate <input_dbspec> <output_dbspec>\n".
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	363 " Like upgrade, but no version check. Creates\n".
664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	364 " a copy of the database to the output spec.\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 "\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 exit;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368
541 e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	369 // Validate tables data
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	370 $errors = FALSE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	371 foreach ($sqlTables as $table => $data)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	372 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	373 if (strtolower($table) != $table)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	374 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	375 echo "Invalid table definition '".$table."', table name must be lower case.\n";
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	376 $errors = TRUE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	377 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	378
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	379 foreach ($data as $def)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	380 if (strtolower($def[0]) != $def[0])
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	381 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	382 echo "Invalid table definition '".$table."', column key '".$def[0]."' must be lower case.\n";
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	383 $errors = TRUE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	384 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	385 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	386
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	387 if ($errors)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	388 die("Errors in table definitions.\n");
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	389
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	391 // Act according to specified command
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	392 $addTestData = FALSE;
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	393 $upgrade = FALSE;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	394
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	395 switch (stCArgLC(1))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 {
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	397 case "test":
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	398 $addTestData = TRUE;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	399
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400 case "new":
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	401 // Try to connect to database
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	402 if (($inSpec = stCArg(2)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	403 die("No PDO database spec specified.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	404
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	405 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	406 die("Could not connect to SQL database '".$inSpec."'.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	407
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	408 echo "Using database spec '".$inSpec."'.\n";
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	409
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	410 // Create tables, add defaults
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	411 if (stCreateTables($inDB, FALSE))
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	412 {
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	413 stAddSettings($inDB, $inDB, $dbMetaData, "dbmeta", FALSE);
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	414 stAddSettings($inDB, $inDB, $siteDefaults, "settings", FALSE);
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	415 stAddSettings($inDB, $inDB, $siteDisplayVars, "display_vars", FALSE);
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	416 }
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	417
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	418 if ($addTestData)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	419 stAddTestData($inDB);
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	420
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	421 stSetDBPermissions($inSpec);
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	424 case "upgrade":
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	425 $upgrade = TRUE;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	426
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	427 case "migrate":
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	428 //
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	429 // Attempt to upgrade database
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	430 //
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	431 if ($argc < 4)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	432 die("Usage: ".$argv[0]." upgrade <input_dbspec> <output_dbspec>\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	433
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	434 $inSpec = stCArg(2);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	435 $outSpec = stCArg(3);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	436
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	437 if ($outSpec == $inSpec)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	438 die("The input and output databases CAN NOT BE SAME.\nBe VERY CAREFUL to not accidentally specify same db!\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	439
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	440 echo "Using database spec '".$inSpec."'.\n";
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	441
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	442 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	443 die("Could not connect to SQL database '".$inSpec."'.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	444
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	445 // Check the current version first ...
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	446 if (($currVersion = stGetDBMeta($inDB, "dbVersion")) === FALSE)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	447 $currVersion = -1;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	448
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	449 if ($currVersion == $dbVersion && stCArgLC(1) == "upgrade")
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	450 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	451 echo "Database is already version ".$dbVersion.", no upgrading needed.\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	452 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	453 else
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	454 {
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	455 // Okay, we shall create an upgraded version ..
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	456 if (($outDB = stConnectSQLDBSpec($outSpec)) === false)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	457 die("Could not connect to SQL database '".$outSpec."'.\n");
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	458
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	459 echo "Database at version ".$currVersion.", upgrading to ".$dbVersion."\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	460 echo "Using OUTPUT database spec '".$outSpec."'.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	461
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	462 // Possibly bail out incompatible upgrades here
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	463
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	464 // Create tables
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	465 if (!stCreateTables($outDB, TRUE))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	466 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	467
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	468 // Migrate data from setting tables ..
552 14078b65641c Fix migration. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	469 if (!stAddSettings($inDB, $outDB, $siteDefaults, "settings", TRUE))
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	470 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	471
552 14078b65641c Fix migration. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	472 if (!stAddSettings($inDB, $outDB, $siteDisplayVars, "display_vars", TRUE))
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	473 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	474
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	475 stAddSettings($inDB, $outDB, $dbMetaData, "dbmeta", TRUE);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	476
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	477 // Migrate other tables
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	478 if (!stMigrateTables($inDB, $outDB, $upgrade, array("settings", "display_vars", "dbmeta")))
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	479 exit;
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	480
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	481 echo "Setting dbVersion.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	482 stSetDBMeta($outDB, "dbVersion", $dbVersion);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	483 echo "Upgrade complete.\n";
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	484
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	485 stSetDBPermissions($inSpec);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	486 stSetDBPermissions($outSpec);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	487 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	488 break;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	489
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	490 default:
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	491 echo "ERROR! Invalid operation mode '".stCArg(1)."'.\n";
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	492 break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	495
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	496 //
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	497 // Clean up permissions
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	498 //
529 ddbc84031a7b Rename createdb.php to managedb.php Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	499 foreach (array("managedb.php") as $filename)
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	500 {
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	501 if (chmod($filename, 0700) === FALSE)
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	502 {
490 505f46b8bb14 Separate variable from string flow. Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	503 echo "ERROR! Could not set permissions for '".$filename."'!\n";
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	504 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	505 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	506
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 ?>

Mercurial > hg > fapweb

annotate managedb.php @ 555:206196b610fd