minor correction

This commit is contained in:
seek3r 2000-12-28 07:50:06 +00:00
parent 4512b958b1
commit 41a28f668a
3 changed files with 5 additions and 127 deletions

View File

@ -1,122 +0,0 @@
<HTML>
<HEAD>
</HEAD>
<BODY STYLE="background-color: #ffffff;">
Welcome to the phpGroupWare Schema Abstraction Definition testing program.<BR>
Here we go:<P>
<?php
$phpgw_info["flags"] = array("noheader" => 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);
?>
</BODY>
</HTML>

View File

@ -24,10 +24,10 @@
} }
if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == "drop"){ 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") { 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"); include("./sql/common_default_records.inc.php");
$included = True; $included = True;
// include($phpgw_info["server"]["server_root"] . "/setup/lang.php"); // include($phpgw_info["server"]["server_root"] . "/setup/lang.php");
@ -37,9 +37,9 @@
if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == "oldversion") { if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == "oldversion") {
$phpgw_info["setup"]["currentver"]["phpgwapi"] = $phpgw_info["setup"]["oldver"]["phpgwapi"]; $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") { 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 /* Not yet implemented

View File

@ -3,7 +3,7 @@
include("../header.inc.php"); include("../header.inc.php");
include("./inc/functions.inc.php"); include("./inc/functions.inc.php");
$SetupDomain = "phpgroupware.org"; $ConfigDomain = "phpgroupware.org";
loaddb(); loaddb();
// $currentver = "drop"; // $currentver = "drop";
$currentver = "new"; $currentver = "new";