[Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.8,1.100.2.9

[Paul POULAIN]

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17194/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
some code cleaning, should not change anything otherwise

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.8
retrieving revision 1.100.2.9
diff -C2 -r1.100.2.8 -r1.100.2.9
*** updatedatabase	9 Sep 2005 08:19:57 -0000	1.100.2.8
--- updatedatabase	23 Sep 2005 11:08:27 -0000	1.100.2.9
***************
*** 924,928 ****
          {
              field   => 'bookfundid',
!             type    => 'char(5)',
              null    => '',
              key     => 'PRI',
--- 924,928 ----
          {
              field   => 'bookfundid',
!             type    => 'varchar(5)',
              null    => '',
              key     => 'PRI',
***************
*** 943,947 ****
          {
              field   => 'id',
!             type    => 'int',
              null    => '',
              key     => 'PRI',
--- 943,947 ----
          {
              field   => 'id',
!             type    => 'int(11)',
              null    => '',
              key     => 'PRI',
***************
*** 962,966 ****
              field   => 'encoding',
              type    => 'varchar(40)',
!             null    => '',
              key     => '',
              default => '',
--- 962,966 ----
              field   => 'encoding',
              type    => 'varchar(40)',
!             null    => 'NOT NULL',
              key     => '',
              default => '',
***************
*** 971,975 ****
          {
              field   => 'notes',
!             type    => 'TEXT',
              null    => 'NULL',
              key     => '',
--- 971,975 ----
          {
              field   => 'notes',
!             type    => 'varchar(255)',
              null    => 'NULL',
              key     => '',
***************
*** 1102,1105 ****
--- 1102,1106 ----
  		$definitions->{$column}->{type}    = $type;
  		$definitions->{$column}->{null}    = $null;
+ 		$definitions->{$column}->{null}    = 'NULL' if $null eq 'YES';
  		$definitions->{$column}->{key}     = $key;
  		$definitions->{$column}->{default} = $default;
***************
*** 1110,1126 ****
  		my $field   = $row->{field};
  		my $type    = $row->{type};
- 		my $null    = $row->{null};
  		my $key     = $row->{key};
  		my $default = $row->{default};
! 		$default="''" unless $default;
  		my $extra   = $row->{extra};
  		my $def     = $definitions->{$field};
  		unless ( $type eq $def->{type}
  			&& $null eq $def->{null}
  			&& $key eq $def->{key}
- 			&& $default eq $def->{default}
  			&& $extra eq $def->{extra} )
  		{
- 
  			if ( $null eq '' ) {
  				$null = 'NOT NULL';
--- 1111,1126 ----
  		my $field   = $row->{field};
  		my $type    = $row->{type};
  		my $key     = $row->{key};
  		my $default = $row->{default};
! 		my $null    = $row->{null};
! # 		$default="''" unless $default;
  		my $extra   = $row->{extra};
  		my $def     = $definitions->{$field};
+ 
  		unless ( $type eq $def->{type}
  			&& $null eq $def->{null}
  			&& $key eq $def->{key}
  			&& $extra eq $def->{extra} )
  		{
  			if ( $null eq '' ) {
  				$null = 'NOT NULL';
***************
*** 1132,1135 ****
--- 1132,1136 ----
  				$extra = '';
  			}
+ 
  			# if it's a new column use "add", if it's an old one, use "change".
  			my $action;
***************
*** 1502,1505 ****
--- 1503,1509 ----
  
  # $Log$
+ # Revision 1.100.2.9  2005/09/23 11:08:27  tipaul
+ # some code cleaning, should not change anything otherwise
+ #
  # Revision 1.100.2.8  2005/09/09 08:19:57  hdl
  # Undoing Logs