From f7646dc9b8d5149c8c1a87fd52d5d18a45932721 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 30 Dec 2005 11:13:29 +0000
Subject: [PATCH] * tool to synchronise TABLE and deletedTABLE structures in
 updatedatabase

---
 updater/updatedatabase | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/updater/updatedatabase b/updater/updatedatabase
index a996f4bb09..5dff13f80b 100755
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -1424,6 +1424,7 @@ $dbh->do('ALTER TABLE marc_tag_structure ADD PRIMARY KEY ( frameworkcode, tagfie
 $dbh->do('ALTER TABLE marc_subfield_structure drop primary key');
 $dbh->do('ALTER TABLE marc_subfield_structure ADD PRIMARY KEY ( frameworkcode, tagfield, tagsubfield )');
 
+$dbh->do("alter table marc_subfield_table change tagorder tagorder int not null default '1'");
 # Get list of columns from marc_word table
 my %marc_word;
 my %nullenabled;
@@ -1445,6 +1446,36 @@ if ($marc_word{subfieldid}) {
 }
 # Populate tables with required data
 
+
+# synch table and deletedtable.
+foreach my $table (('borrowers','items','biblio','biblioitems')) {
+	my %deletedborrowers;
+	print "synch'ing $table\n";
+	$sth = $dbh->prepare("show columns from deleted$table");
+	$sth->execute;
+	while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow ) {
+		$deletedborrowers{$column}=1;
+	}
+	$sth = $dbh->prepare("show columns from $table");
+	$sth->execute;
+	my $previous;
+	while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow ) {
+		unless ($deletedborrowers{$column}) {
+			my $newcol="alter table deleted$table add $column $type";
+			if ($null eq 'YES') {
+				$newcol .= " NULL ";
+			} else {
+				$newcol .= " NOT NULL ";
+			}
+			$newcol .= "default $default" if $default;
+			$newcol .= " after $previous" if $previous;
+			$previous=$column;
+			print "creating column $column\n";
+			$dbh->do($newcol);
+		}
+	}
+}
+
 # fill aqbasket if it's empty and aqorder is not
 # => it means it has just been created & must be filled
 $sth = $dbh->prepare("select count(*) from aqbasket");
@@ -1538,6 +1569,9 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.100.2.16  2005/12/30 11:13:29  tipaul
+# * tool to synchronise TABLE and deletedTABLE structures in updatedatabase
+#
 # Revision 1.100.2.15  2005/12/05 09:50:35  tipaul
 # New systempreference : OpacPasswordChange if set to Yes (default) the user can change it's password. If set to No, he can't. Useful for libraries with LDAP auth, where the password is checked in LDAP, not in Koha, thus Koha can't change it
 #
-- 
2.39.5