From 33833f62f6b5ed6a357df54057633b7d2ca765fa Mon Sep 17 00:00:00 2001 From: Lars Kneschke Date: Mon, 5 Feb 2001 23:10:06 +0000 Subject: [PATCH] adding a patch from latino --- setup/sql/pgsql_newtables.inc.php | 4 ++-- setup/sql/pgsql_upgrade_beta.inc.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php index 7a171812c1..2c7f99e7d1 100644 --- a/setup/sql/pgsql_newtables.inc.php +++ b/setup/sql/pgsql_newtables.inc.php @@ -31,7 +31,7 @@ $phpgw_setup->db->query($sql); - $sql = "create table phpgw_accounts ( + $sql = "create table accounts ( account_id serial, account_lid varchar(25) NOT NULL, account_pwd char(32) NOT NULL, @@ -41,7 +41,7 @@ account_lastloginfrom varchar(255), account_lastpwd_change int, account_status char(1), - account_type char(1) + account_type char(1), unique(account_lid) )"; $phpgw_setup->db->query($sql); diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php index 680f1fa4e5..bffe04a2e1 100644 --- a/setup/sql/pgsql_upgrade_beta.inc.php +++ b/setup/sql/pgsql_upgrade_beta.inc.php @@ -901,8 +901,8 @@ function upgrade0_9_10pre3() { global $phpgw_info, $phpgw_setup; - $phpgw_setup->db->query("create table phpgw_temp as select account_id,account_lid, account_pwd," - . "account_firstname,account_lastname,account_lastlogin,account_lastloginfrom" + $phpgw_setup->db->query("create table phpgw_temp as select account_id,account_lid,account_pwd," + . "account_firstname,account_lastname,account_lastlogin,account_lastloginfrom," . "account_lastpwd_change,account_status from accounts",__LINE__,__FILE__); $sql = "create table phpgw_accounts ( account_id serial, @@ -914,15 +914,15 @@ account_lastloginfrom varchar(255), account_lastpwd_change int, account_status char(1), - account_type char(1) + account_type char(1), unique(account_lid) )"; $phpgw_setup->db->query($sql); $phpgw_setup->db->query("insert into phpgw_accounts select * from phpgw_temp",__LINE__,__FILE__); $phpgw_setup->db->query("drop table phpgw_temp",__LINE__,__FILE__); - $phpgw_setup->db->query("drop sequence acccount_account_id_seq"); - $phpgw_setup->db->query("alter table accounts rename phpgw_accounts",__LINE__,__FILE__); + $phpgw_setup->db->query("drop sequence accounts_account_id_seq"); + $phpgw_setup->db->query("drop table accounts"); $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.10pre4"; }