fapweb: managedb.php annotate

annotate managedb.php @ 804:390241b1d549

Add copyright blurb.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 24 Nov 2014 09:32:03 +0200
parents	81807c56153e
children	1cc9af3f90f0

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 <?
804 390241b1d549 Add copyright blurb. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	3 //
390241b1d549 Add copyright blurb. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	4 // FAPWeb Database management utility
390241b1d549 Add copyright blurb. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	5 // (C) Copyright 2012-2014 Tecnic Software productions (TNSP)
390241b1d549 Add copyright blurb. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	6 //
175 8df523e6326a User require_once instead of require. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	7 require_once "mconfig.inc.php";
8df523e6326a User require_once instead of require. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	8 require_once "msite.inc.php";
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	9 require_once "dbdefs.inc.php";
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
479 86ee2b42a995 Move CLI helper functions to msitegen, again. Matti Hamalainen <ccr@tnsp.org> parents: 426 diff changeset	11 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	12
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	13
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	14 $currVersion = -1;
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	15 $dbMetaData = array(
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	16 "dbVersion" => array(VT_INT, $dbVersion, "Database version"),
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	17 );
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	18
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	19 // Add database meta table into tables to be created
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	20 $sqlTables["dbmeta"] = array(
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	21 array("key" , "VARCHAR(32)", "PRIMARY KEY"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	22 array("vtype" , "INT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	23 array("vstr" , "VARCHAR(128)"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	24 array("vtext" , "TEXT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	25 array("vint" , "INT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	26 array("sdesc" , "VARCHAR(128)"),
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	29
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	30
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 //
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	32 // Helper functions
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 //
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	34 function stCreateTables($dbh, $upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 global $sqlTables;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 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	38 foreach ($sqlTables as $name => $schemaData)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 echo " - '".$name."'\n";
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	41 stDBExecSQL($dbh, "DROP TABLE IF EXISTS ".$name);
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	42 if (!stDBCreateOneTable($dbh, $name, stDBGetTableSchema($dbh, $schemaData)))
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	43 {
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	44 if (!$upgrade)
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	45 return FALSE;
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	46 else
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	47 echo "\nFailed to create table '".$name."'\n";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	48 }
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 return TRUE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	54 function stUpgradeMap($type, $name)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	55 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	56 global $upgradeMappings, $currVersion, $dbVersion;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	57
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	58 $converted = FALSE;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	59 $tmpName = $name;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	60
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	61 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	62 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	63 if (isset($upgradeMappings[$ver]) &&
590 94b9bf155fdb Revert a completely broken change. :S Matti Hamalainen <ccr@tnsp.org> parents: 586 diff changeset	64 isset($upgradeMappings[$ver][$tmpName]) &&
94b9bf155fdb Revert a completely broken change. :S Matti Hamalainen <ccr@tnsp.org> parents: 586 diff changeset	65 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	66 {
590 94b9bf155fdb Revert a completely broken change. :S Matti Hamalainen <ccr@tnsp.org> parents: 586 diff changeset	67 $tmpName = $upgradeMappings[$ver][$tmpName][$type];
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	68 $converted = TRUE;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	69 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	70 }
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	71
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	72 if ($converted)
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	73 return $tmpName;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	74 else
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	75 switch ($type)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	76 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	77 case "table": return $name;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	78 case "key": return $name;
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	79 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	80 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	81 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	82
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	83
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	84 function stDoAddSettings($inDB, $outDB, $settings, $table, $upgrade, $group = FALSE)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 {
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	86 $status = TRUE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	87
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	88 foreach ($settings as $key => $data)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 {
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	90 $sql = false;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	91
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	92 // Get setting type
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	93 switch ($data[0])
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 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	96 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	97 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	98 case VT_INT: $type = "%d"; $var = "vint"; break;
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	99 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	100 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	102 $sqlFmt =
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	103 "INSERT INTO ".$table." (key,vtype,".$var.",sdesc".
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	104 ($group !== FALSE ? ",vgroup" : "").") VALUES (%s,%d,".$type.",%s".
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	105 ($group !== FALSE ? ",%d" : "").")";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	106
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	107 // Check if we are upgrading
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	108 if ($upgrade)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	109 {
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	110 // Map the key, in case the name has changed
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	111 $inKey = stUpgradeMap("key", $key);
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	112 $inTable = stUpgradeMap("table", $table);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	113
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	114 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	115 {
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	116 // Yup, upgrade the data, if we can
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	117 if ($res["vtype"] != $data[0])
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	118 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	119
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	120 $sql = stDBPrepareSQL($outDB, $sqlFmt,
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	121 $key, $data[0], $res[$var], $data[2], $group);
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	122 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	123 }
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	124
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	125 if ($sql === false)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	126 {
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	127 // Normal insertion of default data
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	128 $sql = stDBPrepareSQL($outDB, $sqlFmt,
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	129 $key, $data[0], $data[1], $data[2], $group);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	130 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	131
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	132 if (stDBExecSQL($outDB, $sql) === FALSE)
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	133 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	134 $status = FALSE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	135 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	136 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	137 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	138
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	139 return $status;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	140 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	141
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	142
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	143 function stAddSettingsGroup($inDB, $outDB, $groups, $groupData, $groupTable, $table, $upgrade)
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	144 {
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	145 echo ($upgrade ? "Adding settings to" : "Upgrading settings in")." '".$table."' table.\n";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	146 foreach ($groups as $groupID => $settings)
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	147 {
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	148 if (!isset($groupData[$groupID]))
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	149 {
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	150 echo "Group data not set for settings group ID '".$groupID."'.\n";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	151 return FALSE;
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	152 }
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	153
629 894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	154 // Add group, if needed
894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	155 echo " - Group '".$groupID."' -> ".$groupData[$groupID][1].".";
894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	156 $sql = stDBPrepareSQL($outDB,
894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	157 "INSERT INTO ".$groupTable." (name,description) VALUES (%s,%s)",
894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	158 $groupData[$groupID][0], $groupData[$groupID][1]);
894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	159
894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	160 if (($gid = stDBExecSQLInsert($outDB, $sql)) === false)
628 914d57c80059 Fix database migrations now that we create settings groups. Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	161 {
629 894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	162 echo "\nFailed to add group '".$groupID."'\n";
894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	163 return FALSE;
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	164 }
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	165
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	166 // Add settings to the group
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	167 stDBBeginTransaction($outDB);
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	168 if (stDoAddSettings($inDB, $outDB, $settings, $table, $upgrade, $gid) === false)
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	169 {
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	170 echo "\nFailed to add settings to group '".$groupID."'\n";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	171 return FALSE;
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	172 }
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	173 stDBCommitTransaction($outDB);
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	174 echo "\n";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	175 }
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	176
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	177 return TRUE;
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	178 }
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	179
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	180
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	181 function stAddSettingsNormal($inDB, $outDB, $settings, $table, $upgrade)
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	182 {
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	183 stDBBeginTransaction($outDB);
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	184 echo ($upgrade ? "Adding settings to" : "Upgrading settings in")." '".$table."' table.";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	185 $status = stDoAddSettings($inDB, $outDB, $settings, $table, $upgrade);
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	186 echo "\n";
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	187 if ($status !== FALSE)
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	188 stDBCommitTransaction($outDB);
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	189 return $status;
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	190 }
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	191
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	192
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	193 function stAddTestData($outDB)
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	194 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	195 global $siteTestData;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	196
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	197 echo "Adding test data.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	198
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	199 $status = TRUE;
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	200 stDBBeginTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	201
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	202 foreach ($siteTestData as $table => $data)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	203 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	204 echo " - ".$table."...\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	205 if (count($data) >= 3)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	206 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	207 for ($n = 2; $n < count($data); $n++)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	208 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	209 $arr = array_merge(
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	210 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	211 $data[$n]);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	212
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	213 $sql = call_user_func_array('stDBPrepareSQL', $arr);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	214 if (stDBExecSQL($outDB, $sql) === false)
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	215 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	216 $status = false;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	217 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	218 }
85 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 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	221 else
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	222 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	223 echo " Invalid table / data definition.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	224 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	225 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	226
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	227 stDBCommitTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	228 return $status;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	229 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	230
499 408effd4e9ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	231
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	232 function stGetSQLTypeParam($dbh, $def, $value)
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	233 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	234 switch (substr($def, 0, 3))
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	235 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	236 case "INT":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	237 return intval($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	238
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	239 case "VAR":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	240 case "TEX":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	241 return $dbh->quote($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	242
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	243 default: die("Unknown type ".$col[1].".\n");
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 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	246
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	247
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	248 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	249 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	250 global $sqlTables;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	251
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	252 echo "Migrating tables...\n";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	253 $status = TRUE;
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	254 $dbName = $outDB->getAttribute(PDO::ATTR_DRIVER_NAME);
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	255 stDBBeginTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	256
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	257 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	258 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	259 // 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	260 $sequences = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	261 $inTable = $upgrade ? stUpgradeMap("table", $table) : $table;
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	262 if ($inTable === FALSE \|\| in_array($inTable, $excluded) \|\| in_array($table, $excluded))
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	263 continue;
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	264
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	265 // Process each row of the input table
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	266 echo " - '".$table."' ";
776 81807c56153e Add some error checking for missing source tables in upgrades. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	267 $query = stDBExecSQL($inDB, "SELECT * FROM ".$inTable);
81807c56153e Add some error checking for missing source tables in upgrades. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	268 if ($query === FALSE)
81807c56153e Add some error checking for missing source tables in upgrades. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	269 {
81807c56153e Add some error checking for missing source tables in upgrades. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	270 echo "SKIPPED!";
81807c56153e Add some error checking for missing source tables in upgrades. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	271 }
81807c56153e Add some error checking for missing source tables in upgrades. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	272 else
81807c56153e Add some error checking for missing source tables in upgrades. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	273 foreach ($query as $row)
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	274 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	275 // Convert to new schema, as needed
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	276 $avals = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	277 $acols = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	278
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	279 foreach ($schema as $col)
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	280 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	281 // 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	282 if (isset($row[$col[0]]))
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	283 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	284 $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	285 $acols[] = $col[0];
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	286 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	287
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	288 // 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	289 if (in_array("AUTOINCREMENT", $col))
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	290 $sequences[] = $col[0];
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
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	293 $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	294 if (stDBExecSQL($outDB, $sql) === false)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	295 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	296 $status = FALSE;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	297 break;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	298 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	299 echo ".";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	300 }
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 // Perform some specialities here
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	303 switch ($dbName)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	304 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	305 case "pgsql":
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	306 // For PostgreSQL we need to update sequences
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	307 foreach ($sequences as $seq)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	308 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	309 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	310 ($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	311 ($seq_id <= $max_id))
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	312 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	313 echo "SEQFIX";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	314 stDBExecSQL($outDB, "SELECT setval('".$table."_".$seq."_seq', ".$max_id.")");
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	315 }
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	316 }
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	317 break;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	318 }
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	319
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	320 echo "\n";
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	321 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	322
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	323 stDBCommitTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	324
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	325 return $status;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	326 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	327
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	328
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	329 function stSetDBPermissions($spec)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	330 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	331 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	332 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	333 $filename = substr($spec, 7);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	334 echo
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	335 "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	336 "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	337 "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	338 "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	339
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	340 if (chmod($filename, 0600) === FALSE)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	341 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	342 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	343 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	344 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	345 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	346
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	347
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	348 //
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	349 // Main program starts
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	350 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 if ($argc < 2)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 {
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	353 echo
529 ddbc84031a7b Rename createdb.php to managedb.php Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	354 "ManageDB - Manage FAPWeb SQL database\n".
565 ed2247111fdd Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	355 "(C) Copyright 2012-2014 ccr/TNSP\n".
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	356 "\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	357 "Usage: ".$argv[0]." <mode> [args]\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358 "Where mode is one of following:\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	360 " 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	361 " 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	362 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	363 " 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	364 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	365 " 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	366 " 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	367 " 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	368 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	369 " migrate <input_dbspec> <output_dbspec>\n".
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	370 " Like upgrade, but no version check. Creates\n".
664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	371 " 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	372 "\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373 exit;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375
541 e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	376 // Validate tables data
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	377 $errors = FALSE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	378 foreach ($sqlTables as $table => $data)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	379 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	380 if (strtolower($table) != $table)
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."', table name 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 foreach ($data as $def)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	387 if (strtolower($def[0]) != $def[0])
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	388 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	389 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	390 $errors = TRUE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	391 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	392 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	393
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	394 if ($errors)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	395 die("Errors in table definitions.\n");
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	396
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	398 // Act according to specified command
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	399 $addTestData = FALSE;
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	400 $upgrade = FALSE;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	401
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	402 switch (stCArgLC(1))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 {
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	404 case "test":
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	405 $addTestData = TRUE;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	406
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 case "new":
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	408 // Try to connect to database
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	409 if (($inSpec = stCArg(2)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	410 die("No PDO database spec specified.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	411
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	412 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	413 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	414
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	415 echo "Using database spec '".$inSpec."'.\n";
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	416
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	417 // Create tables, add defaults
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	418 if (stCreateTables($inDB, FALSE))
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	419 {
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	420 stAddSettingsNormal($inDB, $inDB, $dbMetaData, "dbmeta", FALSE, FALSE);
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	421 stAddSettingsGroup($inDB, $inDB, $siteDefaultSettings, $siteSettingsGroups, "settings_groups", "settings", FALSE);
8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	422 stAddSettingsNormal($inDB, $inDB, $siteDisplayVars, "display_vars", FALSE, FALSE);
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	423 }
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	424
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	425 if ($addTestData)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	426 stAddTestData($inDB);
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	427
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	428 stSetDBPermissions($inSpec);
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	431 case "upgrade":
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	432 $upgrade = TRUE;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	433
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	434 case "migrate":
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	435 //
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	436 // Attempt to upgrade database
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	437 //
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	438 if ($argc < 4)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	439 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	440
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	441 $inSpec = stCArg(2);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	442 $outSpec = stCArg(3);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	443
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	444 if ($outSpec == $inSpec)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	445 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	446
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	447 echo "Using INPUT database spec '".$inSpec."'.\n";
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	448
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	449 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	450 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	451
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	452 // Check the current version first ...
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	453 if (($currVersion = stGetDBMeta($inDB, "dbVersion")) === FALSE)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	454 $currVersion = -1;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	455
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	456 if ($currVersion == $dbVersion && stCArgLC(1) == "upgrade")
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	457 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	458 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	459 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	460 else
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	461 {
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	462 // 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	463 if (($outDB = stConnectSQLDBSpec($outSpec)) === false)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	464 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	465
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	466 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	467 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	468
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	469 // Possibly bail out incompatible upgrades here
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	470
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	471 // Create tables
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	472 if (!stCreateTables($outDB, TRUE))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	473 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	474
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	475 // Migrate data from setting tables ..
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	476 if (!stAddSettingsGroup($inDB, $outDB, $siteDefaultSettings, $siteSettingsGroups, "settings_groups", "settings", TRUE))
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	477 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	478
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	479 if (!stAddSettingsNormal($inDB, $outDB, $siteDisplayVars, "display_vars", TRUE))
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	480 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	481
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	482 stAddSettingsNormal($inDB, $outDB, $dbMetaData, "dbmeta", TRUE);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	483
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	484 // Migrate other tables
629 894a4a6bfb5f Better fix for the DB migration issue. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	485 if (!stMigrateTables($inDB, $outDB, $upgrade, array("settings", "display_vars", "dbmeta", "settings_groups")))
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	486 exit;
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	487
616 36e614bf864f Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	488 // Set new database version
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	489 echo "Setting dbVersion.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	490 stSetDBMeta($outDB, "dbVersion", $dbVersion);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	491 echo "Upgrade complete.\n";
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	492
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	493 stSetDBPermissions($inSpec);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	494 stSetDBPermissions($outSpec);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	495 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	496 break;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	497
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	498 default:
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	499 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	500 break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	503
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 // Clean up permissions
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	506 //
620 8444fe96120e Implement setting groups for admin interface settings. This is just the Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	507 foreach (array("managedb.php", "wanktool.php") as $filename)
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	508 {
630 b84fc6e7847e Suppress PHP errors. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	509 if (@chmod($filename, 0700) === FALSE)
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	510 {
490 505f46b8bb14 Separate variable from string flow. Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	511 echo "ERROR! Could not set permissions for '".$filename."'!\n";
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	512 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	513 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	514
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 ?>

Mercurial > hg > fapweb

annotate managedb.php @ 804:390241b1d549