diff --git a/setup/phpgw_schema_proc_test.php b/setup/phpgw_schema_proc_test.php deleted file mode 100644 index 9ee5ebd182..0000000000 --- a/setup/phpgw_schema_proc_test.php +++ /dev/null @@ -1,122 +0,0 @@ - - - - -Welcome to the phpGroupWare Schema Abstraction Definition testing program.
-Here we go:

- True, "nonavbar" => True, "currentapp" => "home", "noapi" => True); - include("../header.inc.php"); - include("./inc/functions.inc.php"); - - $SetupDomain = "phpgroupware.org"; -$tables = array( - "departments" => array( - "id" => array( - "type" => "autoincrement" - ), - "short" => array( - "type" => "varchar", - "precision" => 20, - "nullable" => false - ), - "name" => array( - "type" => "varchar", - "precision" => 50, - "nullable" => false - ), - "active" => array( - "type" => "char", - "precision" => 1, - "nullable" => false, - "default" => "Y" - ) - ), - "actions" => array( - "id" => array( - "type" => "autoincrement" - ), - "short" => array( - "type" => "varchar", - "precision" => 20, - "nullable" => false - ), - "name" => array( - "type" => "varchar", - "precision" => 50, - "nullable" => false - ), - "active" => array( - "type" => "char", - "precision" => 1, - "nullable" => false, - "default" => "Y" - ) - ), - "timecards" => array( - "id" => array( - "type" => "autoincrement" - ), - "jcn" => array( - "type" => "int", - "precision" => 4, - "nullable" => false - ), - "seq" => array( - "type" => "int", - "precision" => 4, - "nullable" => false - ), - "actionon" => array( - "type" => "timestamp", - "nullable" => false, - "default" => "current_timestamp" - ), - "inputon" => array( - "type" => "timestamp", - "nullable" => false, - "default" => "current_timestamp" - ), - "actionby" => array( - "type" => "int", - "precision" => 4, - "nullable" => false - ), - "status" => array( - "type" => "int", - "precision" => 4, - "nullable" => false - ), - "action" => array( - "type" => "int", - "precision" => 4, - "nullable" => false - ), - "hours" => array( - "type" => "float", - "precision" => 4, - "nullable" => false, - "default" => 0.0 - ), - "summary" => array( - "type" => "varchar", - "precision" => 80, - "nullable" => false - ), - "description" => array( - "type" => "varchar", - "precision" => 1024, - "nullable" => true - ), - "revision" => array( - "type" => "varchar", - "precision" => 20, - "nullable" => true - ) - ) - ); - -$phpgw_schema_proc->GenerateScripts($tables, true); -?> - - diff --git a/setup/sql/common_main.inc.php b/setup/sql/common_main.inc.php index 7c2f244130..6b1df69d03 100644 --- a/setup/sql/common_main.inc.php +++ b/setup/sql/common_main.inc.php @@ -24,10 +24,10 @@ } if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == "drop"){ - include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_droptables.inc.php"); + include("./sql/".$phpgw_domain[$ConfigDomain]["db_type"]."_droptables.inc.php"); } if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == "new") { - include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_newtables.inc.php"); + include("./sql/".$phpgw_domain[$ConfigDomain]["db_type"]."_newtables.inc.php"); include("./sql/common_default_records.inc.php"); $included = True; // include($phpgw_info["server"]["server_root"] . "/setup/lang.php"); @@ -37,9 +37,9 @@ if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == "oldversion") { $phpgw_info["setup"]["currentver"]["phpgwapi"] = $phpgw_info["setup"]["oldver"]["phpgwapi"]; if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == "7122000" || $phpgw_info["setup"]["currentver"]["phpgwapi"] == "8032000" || $phpgw_info["setup"]["currentver"]["phpgwapi"] == "8072000" || $phpgw_info["setup"]["currentver"]["phpgwapi"] == "8212000" || $phpgw_info["setup"]["currentver"]["phpgwapi"] == "9052000" || $phpgw_info["setup"]["currentver"]["phpgwapi"] == "9072000") { - include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_prebeta.inc.php"); + include("./sql/".$phpgw_domain[$ConfigDomain]["db_type"]."_upgrade_prebeta.inc.php"); } - include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_beta.inc.php"); + include("./sql/".$phpgw_domain[$ConfigDomain]["db_type"]."_upgrade_beta.inc.php"); } /* Not yet implemented diff --git a/setup/test.php b/setup/test.php index bdf14a7f92..05aa6cb87e 100644 --- a/setup/test.php +++ b/setup/test.php @@ -3,7 +3,7 @@ include("../header.inc.php"); include("./inc/functions.inc.php"); - $SetupDomain = "phpgroupware.org"; + $ConfigDomain = "phpgroupware.org"; loaddb(); // $currentver = "drop"; $currentver = "new";