The kohafield in authorities can't be NOT NULL (as it is always null in fact...)

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/installer/kohastructure.sql b/installer/kohastructure.sql
index 9687357..c07a065 100644 (file)
--- a/installer/kohastructure.sql
+++ b/installer/kohastructure.sql
@@ -289,7 +289,7 @@ CREATE TABLE `auth_subfield_structure` (
   `isurl` tinyint(1) default NULL,
   `hidden` tinyint(3) NOT NULL default 0,
   `linkid` tinyint(1) NOT NULL default 0,
-  `kohafield` varchar(45) NOT NULL default '',
+  `kohafield` varchar(45) NULL default '',
   `frameworkcode` varchar(8) NOT NULL default '',
   PRIMARY KEY  (`authtypecode`,`tagfield`,`tagsubfield`),
   KEY `tab` (`authtypecode`,`tab`)

diff --git a/updater/update22to30.pl b/updater/update22to30.pl
index 2eed298..55b65e3 100755 (executable)
--- a/updater/update22to30.pl
+++ b/updater/update22to30.pl
@@ -207,7 +207,7 @@ my $DBversion = "3.00.00.000";
         aqbookfund => { 'branchcode' => 'varchar(4) NULL'},
         aqbudget => { 'branchcode' => 'varchar(4) NULL'},
         auth_header => { 'marc' => 'BLOB NOT NULL', 'linkid' => 'BIGINT(20) NULL'},
-        auth_subfield_structure =>{ 'hidden' => 'TINYINT(3) NOT NULL default 0', 'kohafield' => 'VARCHAR(45) NOT NULL', 'linkid' =>  'TINYINT(1) NOT NULL default 0', 'isurl' => 'TINYINT(1)', 'frameworkcode'=>'VARCHAR(8) NOT  NULL'},
+        auth_subfield_structure =>{ 'hidden' => 'TINYINT(3) NOT NULL default 0', 'kohafield' => 'VARCHAR(45) NULL', 'linkid' =>  'TINYINT(1) NOT NULL default 0', 'isurl' => 'TINYINT(1)', 'frameworkcode'=>'VARCHAR(8) NOT  NULL'},
         marc_breeding => { 'isbn' => 'varchar(13) NOT NULL'},
         serial =>{ 'publisheddate' => 'date', 'claimdate' => 'date', 'itemnumber'=>'text NULL','routingnotes'=>'text NULL',},
         statistics => { 'associatedborrower' => 'integer'},