From e879cf7f427124c32ca20a2b99fb0d4d8ef8558a Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 23 Oct 2015 10:10:38 -0400 Subject: [PATCH] Bug 15053 - sample_creator_data.sql now fails during a fresh install ERROR 1136 (21S01) at line 6: Column count doesn't match value count at row 1 Test Plan: 1) Start fresh install 2) Install all test data 3) Note the SQL error 4) Apply this patch 5) Repeat steps 1 and 2 6) Note no error --- .../mysql/de-DE/optional/sample_creator_data.sql | 2 +- .../data/mysql/en/optional/sample_creator_data.sql | 2 +- .../mysql/es-ES/optional/sample_creator_data.sql | 2 +- .../mysql/it-IT/necessari/sample_creator_data.sql | 2 +- .../nb-NO/2-Valgfritt/sample_creator_data.sql | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_creator_data.sql b/installer/data/mysql/de-DE/optional/sample_creator_data.sql index d5218aa..53c4a87 100644 --- a/installer/data/mysql/de-DE/optional/sample_creator_data.sql +++ b/installer/data/mysql/de-DE/optional/sample_creator_data.sql @@ -3,7 +3,7 @@ LOCK TABLES `creator_layouts` WRITE; /*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; -INSERT INTO `creator_layouts` VALUES (17,'CODE39',1,'BIBBAR','Etikettentest',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Testlayout',0,'TR',10,'POINT',0,'L','barcode',' +INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `printing_type`, `layout_name`, `guidebox`, `font`, `font_size`, `units`, `callnum_split`, `text_justify`, `format_string`, `layout_xml`, `creator`) VALUES (17,'CODE39',1,'BIBBAR','Etikettentest',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Testlayout',0,'TR',10,'POINT',0,'L','barcode',' diff --git a/installer/data/mysql/en/optional/sample_creator_data.sql b/installer/data/mysql/en/optional/sample_creator_data.sql index 91d7d00..b29c42d 100644 --- a/installer/data/mysql/en/optional/sample_creator_data.sql +++ b/installer/data/mysql/en/optional/sample_creator_data.sql @@ -3,7 +3,7 @@ LOCK TABLES `creator_layouts` WRITE; /*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; -INSERT INTO `creator_layouts` VALUES (17,'CODE39',1,'BIBBAR','Label Test',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode',' +INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `printing_type`, `layout_name`, `guidebox`, `font`, `font_size`, `units`, `callnum_split`, `text_justify`, `format_string`, `layout_xml`, `creator`) VALUES (17,'CODE39',1,'BIBBAR','Label Test',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode',' diff --git a/installer/data/mysql/es-ES/optional/sample_creator_data.sql b/installer/data/mysql/es-ES/optional/sample_creator_data.sql index 91d7d00..b29c42d 100644 --- a/installer/data/mysql/es-ES/optional/sample_creator_data.sql +++ b/installer/data/mysql/es-ES/optional/sample_creator_data.sql @@ -3,7 +3,7 @@ LOCK TABLES `creator_layouts` WRITE; /*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; -INSERT INTO `creator_layouts` VALUES (17,'CODE39',1,'BIBBAR','Label Test',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode',' +INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `printing_type`, `layout_name`, `guidebox`, `font`, `font_size`, `units`, `callnum_split`, `text_justify`, `format_string`, `layout_xml`, `creator`) VALUES (17,'CODE39',1,'BIBBAR','Label Test',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode',' diff --git a/installer/data/mysql/it-IT/necessari/sample_creator_data.sql b/installer/data/mysql/it-IT/necessari/sample_creator_data.sql index 2608f7c..bb33fc3 100644 --- a/installer/data/mysql/it-IT/necessari/sample_creator_data.sql +++ b/installer/data/mysql/it-IT/necessari/sample_creator_data.sql @@ -3,7 +3,7 @@ LOCK TABLES `creator_layouts` WRITE; /*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; -INSERT INTO `creator_layouts` VALUES (1,'CODE39',1,'BIBBAR','Test etic. (BIBBAR)',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'), +INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `printing_type`, `layout_name`, `guidebox`, `font`, `font_size`, `units`, `callnum_split`, `text_justify`, `format_string`, `layout_xml`, `creator`) VALUES (1,'CODE39',1,'BIBBAR','Test etic. (BIBBAR)',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'), (2,'CODE39',1,'BAR','Test etic. (BAR)',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'), (3,'CODE39',1,'BAR','Test tessere',0,'TR',10,'POINT',0,'L','barcode',' diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_creator_data.sql b/installer/data/mysql/nb-NO/2-Valgfritt/sample_creator_data.sql index 91d7d00..b29c42d 100644 --- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_creator_data.sql +++ b/installer/data/mysql/nb-NO/2-Valgfritt/sample_creator_data.sql @@ -3,7 +3,7 @@ LOCK TABLES `creator_layouts` WRITE; /*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */; -INSERT INTO `creator_layouts` VALUES (17,'CODE39',1,'BIBBAR','Label Test',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode',' +INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `printing_type`, `layout_name`, `guidebox`, `font`, `font_size`, `units`, `callnum_split`, `text_justify`, `format_string`, `layout_xml`, `creator`) VALUES (17,'CODE39',1,'BIBBAR','Label Test',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode',' -- 1.7.2.5