[Koha-cvs] koha/updater updatedatabase [rel_3_0]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/10/16 14:23:48

Modified files:
	updater        : updatedatabase 

Log message:
	Borrowers.branchcode must be varchar(10) too.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_3_0&r1=1.157.2.8&r2=1.157.2.9

Patches:
Index: updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.157.2.8
retrieving revision 1.157.2.9
diff -u -b -r1.157.2.8 -r1.157.2.9
--- updatedatabase	16 Oct 2006 09:47:08 -0000	1.157.2.8
+++ updatedatabase	16 Oct 2006 14:23:47 -0000	1.157.2.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.157.2.8 2006/10/16 09:47:08 toins Exp $
+# $Id: updatedatabase,v 1.157.2.9 2006/10/16 14:23:47 toins Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -483,6 +483,12 @@
 			null => 'NULL',
 			after => 'contactfirstname',
 		},
+		{
+		    field => 'branchcode',
+		    type  => 'varchar(10)',
+		    null  => 'NOT NULL',
+		    extra => '',
+		},
 	],
 	
 	biblioitems =>  [
@@ -1219,7 +1225,6 @@
 					after => 'borrowernotes',
 				},
 			],
-
 		);
 		
 foreach my $table (keys %column_change) {
@@ -1599,7 +1604,8 @@
 while ( ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow ){
 	$marcdone=1 if ($type eq 'longtext' && $column eq 'marcxml') ;
 }
-unless ($marcdone) {
+#unless ($marcdone) {
+unless (1) { # to disable this block just to test.
 	print "moving MARC record to biblioitems table\n";
 	# changing marc field type
 	$dbh->do('ALTER TABLE `biblioitems` CHANGE `marc` `marc` BLOB NULL DEFAULT NULL ');
@@ -1837,12 +1843,8 @@
 exit;
 
 # $Log: updatedatabase,v $
-# Revision 1.157.2.8  2006/10/16 09:47:08  toins
-# Moving branches.branchecode from varchar(4) to varchar(10).
-# Moving itemtypes.itemtype from varchar(4) to varchar(10).
-# Moving categories.categoryode from varchar(2) to varchar(10)
-# sorting modified 's tables.
-# Fix: key=>'PRIMARY KEY' to key => 'PRI'.
+# Revision 1.157.2.9  2006/10/16 14:23:47  toins
+# Borrowers.branchcode must be varchar(10) too.
 #
 # Revision 1.157.2.7  2006/10/11 15:22:23  tipaul
 # - adding some missing fields, coming from dev_week :