Bug 15086: Creators layout and template sql has warnings

When doing a hacked install off the master branch:
use ... {koha database name}
truncate creator_layouts;
truncate creator_templates;
truncate printers_profiles;
source installer/data/mysql/... {name of a sample_labels type file}
Warnings are generated, which may not be visible in the UI.

Most of the warnings were triggered by:
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
http://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_illegal_ha

In the Russian, the layout_name was truncated, because the layout_name was only 20. An atomic update sql and kohastructure.sql update were provided to widen it to 25.
http://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_warn_data_truncated

Also fr-FR, ru-RU, and uk-UA were slightly different in structure, so the structure was made the same as the other files.

See comment #1 for the test plan.

NOTE: pl-PL is likely very out of date, but is not affected in this regard.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works, no more warnings
mysql> show warnings;
Empty set (0.01 sec)

No errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/installer/data/mysql/atomicupdate/Bug_15086_UpdateLayoutNameSize.sql b/installer/data/mysql/atomicupdate/Bug_15086_UpdateLayoutNameSize.sql
new file mode 100644 (file)
index 0000000..eeee785
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/Bug_15086_UpdateLayoutNameSize.sql
@@ -0,0 +1 @@
+ALTER TABLE creator_layouts MODIFY layout_name char(25) NOT NULL DEFAULT 'DEFAULT';

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 53c4a87..66ff21a 100644 (file)
--- a/installer/data/mysql/de-DE/optional/sample_creator_data.sql
+++ b/installer/data/mysql/de-DE/optional/sample_creator_data.sql
@@ -2,7 +2,6 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 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','<opt></opt>','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(20,'CODE39',1,'BAR','Testlayout',0,'TR',10,'POINT',0,'L','barcode','<opt page_side="F" units="POINT">
   <images name="image_1" Dx="72" Ox="0" Oy="0" Sx="0" Sy="0" Tx="4.5" Ty="63">
     <data_source image_name="none" image_source="patronimages" />
@@ -15,20 +14,16 @@ INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `prin
   <text font="TR" font_size="6" llx="115" lly="65" text_alignment="L" />
 </opt>
 ','Patroncards');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
 UNLOCK TABLES;
 
 
 LOCK TABLES `creator_templates` WRITE;
-/*!40000 ALTER TABLE `creator_templates` DISABLE KEYS */;
 INSERT INTO `creator_templates` VALUES (1,1,'Avery 5160 | 1 x 2-5/8','3 Spalten, 10 Reihen mit Etiketten',8.5,11,2.63,1,0.139,0,0.35,0.23,3,10,0.13,0,'INCH','Labels'),(7,13,'Demco WS14942260','1\" X 1.5\" Rückenschild | Bis zu 4 Zeilen Text',8.5,11,1.5,1,0.236,0,0.5,0.25,5,10,0.0625,0,'INCH','Labels'),(12,14,'Demco WS14942260','1\" X 1.5\" Rückenschild | Bis zu 5 Zeilen Text',8.5,11,1.5,1,0.139,0,0.53,0.3,5,10,0.0625,0,'INCH','Labels'),(22,0,'Standardtemplate 01','Standardbeschreibung',0,5,0,0,0,0,0,0,0,0,0,0,'POINT','Labels'),(23,16,'HB-PC0001','Template für selbsterstellte Benutzerausweise',8.5,11,3.1875,1.9375,0,0,0.6875,0.875,2,4,0.4375,0.1875,'INCH','Patroncards');
-/*!40000 ALTER TABLE `creator_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
 LOCK TABLES `printers_profile` WRITE;
-/*!40000 ALTER TABLE `printers_profile` DISABLE KEYS */;
 INSERT INTO `printers_profile` VALUES (1,'Laserdrucker Bibliothek',1,'Bypass',-2,9,3,0,'POINT','Labels'),(11,'Laserdrucker Bibliothek',1,'Fach 1',0,0,0,0,'POINT','Labels'),(16,'Testdrucker 01',23,'Testfach',0,0,0,0,'POINT','Patroncards');
-/*!40000 ALTER TABLE `printers_profile` ENABLE KEYS */;
 UNLOCK TABLES;
+
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

diff --git a/installer/data/mysql/en/optional/sample_creator_data.sql b/installer/data/mysql/en/optional/sample_creator_data.sql
index b29c42d..682eff9 100644 (file)
--- a/installer/data/mysql/en/optional/sample_creator_data.sql
+++ b/installer/data/mysql/en/optional/sample_creator_data.sql
@@ -2,7 +2,6 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 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','<opt></opt>','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode','<opt page_side="F" units="POINT">
   <images name="image_1" Dx="72" Ox="0" Oy="0" Sx="0" Sy="0" Tx="4.5" Ty="63">
     <data_source image_name="none" image_source="patronimages" />
@@ -15,20 +14,16 @@ INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `prin
   <text font="TR" font_size="6" llx="115" lly="65" text_alignment="L" />
 </opt>
 ','Patroncards');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
 UNLOCK TABLES;
 
 
 LOCK TABLES `creator_templates` WRITE;
-/*!40000 ALTER TABLE `creator_templates` DISABLE KEYS */;
 INSERT INTO `creator_templates` VALUES (1,1,'Avery 5160 | 1 x 2-5/8','3 columns, 10 rows of labels',8.5,11,2.63,1,0.139,0,0.35,0.23,3,10,0.13,0,'INCH','Labels'),(7,13,'Demco WS14942260','1\" X 1.5\" Spine Label | Setup for up to four lines of text',8.5,11,1.5,1,0.236,0,0.5,0.25,5,10,0.0625,0,'INCH','Labels'),(12,14,'Demco WS14942260','1\" X 1.5\" Spine Label | Setup for five lines of text',8.5,11,1.5,1,0.139,0,0.53,0.3,5,10,0.0625,0,'INCH','Labels'),(22,0,'DEFAULT TEMPLATE 01','Default description',0,5,0,0,0,0,0,0,0,0,0,0,'POINT','Labels'),(23,16,'HB-PC0001','A template for home brewed patron card forms',8.5,11,3.1875,1.9375,0,0,0.6875,0.875,2,4,0.4375,0.1875,'INCH','Patroncards');
-/*!40000 ALTER TABLE `creator_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
 LOCK TABLES `printers_profile` WRITE;
-/*!40000 ALTER TABLE `printers_profile` DISABLE KEYS */;
 INSERT INTO `printers_profile` VALUES (1,'Library Laser',1,'Bypass',-2,9,3,0,'POINT','Labels'),(11,'Library Laser',1,'Tray 1',0,0,0,0,'POINT','Labels'),(16,'Test Printer 01',23,'Test Bin',0,0,0,0,'POINT','Patroncards');
-/*!40000 ALTER TABLE `printers_profile` ENABLE KEYS */;
 UNLOCK TABLES;
+
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

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 b29c42d..d519044 100644 (file)
--- a/installer/data/mysql/es-ES/optional/sample_creator_data.sql
+++ b/installer/data/mysql/es-ES/optional/sample_creator_data.sql
@@ -2,7 +2,6 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 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','<opt></opt>','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode','<opt page_side="F" units="POINT">
   <images name="image_1" Dx="72" Ox="0" Oy="0" Sx="0" Sy="0" Tx="4.5" Ty="63">
     <data_source image_name="none" image_source="patronimages" />
@@ -15,20 +14,15 @@ INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `prin
   <text font="TR" font_size="6" llx="115" lly="65" text_alignment="L" />
 </opt>
 ','Patroncards');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
 UNLOCK TABLES;
 
-
 LOCK TABLES `creator_templates` WRITE;
-/*!40000 ALTER TABLE `creator_templates` DISABLE KEYS */;
 INSERT INTO `creator_templates` VALUES (1,1,'Avery 5160 | 1 x 2-5/8','3 columns, 10 rows of labels',8.5,11,2.63,1,0.139,0,0.35,0.23,3,10,0.13,0,'INCH','Labels'),(7,13,'Demco WS14942260','1\" X 1.5\" Spine Label | Setup for up to four lines of text',8.5,11,1.5,1,0.236,0,0.5,0.25,5,10,0.0625,0,'INCH','Labels'),(12,14,'Demco WS14942260','1\" X 1.5\" Spine Label | Setup for five lines of text',8.5,11,1.5,1,0.139,0,0.53,0.3,5,10,0.0625,0,'INCH','Labels'),(22,0,'DEFAULT TEMPLATE 01','Default description',0,5,0,0,0,0,0,0,0,0,0,0,'POINT','Labels'),(23,16,'HB-PC0001','A template for home brewed patron card forms',8.5,11,3.1875,1.9375,0,0,0.6875,0.875,2,4,0.4375,0.1875,'INCH','Patroncards');
-/*!40000 ALTER TABLE `creator_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
 LOCK TABLES `printers_profile` WRITE;
-/*!40000 ALTER TABLE `printers_profile` DISABLE KEYS */;
 INSERT INTO `printers_profile` VALUES (1,'Library Laser',1,'Bypass',-2,9,3,0,'POINT','Labels'),(11,'Library Laser',1,'Tray 1',0,0,0,0,'POINT','Labels'),(16,'Test Printer 01',23,'Test Bin',0,0,0,0,'POINT','Patroncards');
-/*!40000 ALTER TABLE `printers_profile` ENABLE KEYS */;
 UNLOCK TABLES;
+
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql
index 15bf16b..472ee2a 100644 (file)
--- a/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql
+++ b/installer/data/mysql/fr-FR/2-Optionel/sample_labels.sql
@@ -1,5 +1,6 @@
--- Label Templates
-set NAMES 'utf8';
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+
 LOCK TABLES `creator_templates` WRITE;
 INSERT INTO `creator_templates` VALUES
 (1,0,'Avery 5160 | 1 x 2-5/8',  '3 colonnes, 10 lignes d''étiquette',                                           8.5,    11,     2.63,   1,      0.139,  0,      0.35,   0.23,   3,      10,     0.13,   0,      'INCH', 'Labels'),
@@ -10,11 +11,13 @@ INSERT INTO `creator_templates` VALUES
 (6,0,'cards',                   'Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\"  [3x10] : equivalent: Gaylord JD-ML3000', 8.5,    11,     2.75,   1.05,   0,      0,      0.25,   0,      3,      10,     0.2,    0.01,   'INCH', 'Labels'),
 (7,0,'Demco WS14942260',        '1\" X 1.5\" Etiquettes de cotes',                                              8.5,    11,     1.5,    1,      0.236,  0,      0.4,    0.25,   5,      10,     0.0625, 0,      'INCH', 'Labels');
 UNLOCK TABLES; 
+
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 INSERT INTO `creator_layouts` VALUES
 (1,'CODE39',1,'BIBBAR','biblio and barcode',0,1,'TR',7,'POINT',0,'L','title, author, itemcallnumber', '<opt></opt>', 'Labels'),
 (2,'CODE39',1,'BIB','spine',0,1,'TR',3,'POINT',1,'L','itemcallnumber', '<opt></opt>', 'Labels'),
 (3,'CODE39',1,'BARBIB','barcode and biblio',0,1,'TR',3,'POINT',1,'L','title, author, itemcallnumber', '<opt></opt>', 'Labels');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
 UNLOCK TABLES;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

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 77981ef..4d130e3 100644 (file)
--- a/installer/data/mysql/it-IT/necessari/sample_creator_data.sql
+++ b/installer/data/mysql/it-IT/necessari/sample_creator_data.sql
@@ -2,7 +2,6 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 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','<opt></opt>','Labels'),
 (2,'CODE39',1,'BAR','Test etic. (BAR)',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),
@@ -18,29 +17,23 @@ INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `prin
   <text font="TR" font_size="6" llx="115" lly="65" text_alignment="L" />
 </opt>
 ','Patroncards');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
 UNLOCK TABLES;
 
-
 LOCK TABLES `creator_templates` WRITE;
-/*!40000 ALTER TABLE `creator_templates` DISABLE KEYS */;
 INSERT INTO `creator_templates` VALUES
 (1,1,'Avery 5160 | 1 x 2-5/8','3 colonne, 10 righe di etichette',8.5,11,2.63,1,0.139,0,0.35,0.23,3,10,0.13,0,'INCH','Labels'),
 (2,2,'Demco WS14942260','1\" X 1.5\" Etichetta dorso | Configurazione fino a 4 righe di testo',8.5,11,1.5,1,0.236,0,0.5,0.25,5,10,0.0625,0,'INCH','Labels'),
 (3,2,'Demco WS14942260','1\" X 1.5\" Etichetta dorso | Configurazione fino a 5 righe di testo',8.5,11,1.5,1,0.139,0,0.53,0.3,5,10,0.0625,0,'INCH','Labels'),
 (4,1,'DEFAULT TEMPLATE 01','Default',0,5,0,0,0,0,0,0,0,0,0,0,'POINT','Labels'),
 (5,3,'HB-PC0001','Un template per tessera stampate direttamente dalla biblioteca',8.5,11,3.1875,1.9375,0,0,0.6875,0.875,2,4,0.4375,0.1875,'INCH','Patroncards');
-
-/*!40000 ALTER TABLE `creator_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
 LOCK TABLES `printers_profile` WRITE;
-/*!40000 ALTER TABLE `printers_profile` DISABLE KEYS */;
 INSERT INTO `printers_profile` VALUES
 (1,'Stampante Etichette',1,'Bypass',-2,9,3,0,'POINT','Labels'),
 (2,'Stampante Etichette 2',2,'Tray 1',0,0,0,0,'POINT','Labels'),
 (3,'Stampante tessere',5,'Test Bin',0,0,0,0,'POINT','Patroncards');
-/*!40000 ALTER TABLE `printers_profile` ENABLE KEYS */;
 UNLOCK TABLES;
+
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 12aa8d8..781d26d 100644 (file)
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1376,7 +1376,7 @@ CREATE TABLE `creator_layouts` (
   `barcode_type` char(100) NOT NULL DEFAULT 'CODE39',
   `start_label` int(2) NOT NULL DEFAULT '1',
   `printing_type` char(32) NOT NULL DEFAULT 'BAR',
-  `layout_name` char(20) NOT NULL DEFAULT 'DEFAULT',
+  `layout_name` char(25) NOT NULL DEFAULT 'DEFAULT',
   `guidebox` int(1) DEFAULT '0',
   `oblique_title` int(1) DEFAULT '1',
   `font` char(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'TR',

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 b29c42d..d519044 100644 (file)
--- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_creator_data.sql
+++ b/installer/data/mysql/nb-NO/2-Valgfritt/sample_creator_data.sql
@@ -2,7 +2,6 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 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','<opt></opt>','Labels'),(18,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(19,'CODE39',1,'BAR','DEFAULT',0,'TR',3,'POINT',0,'L','title, author, isbn, issn, itemtype, barcode, itemcallnumber','<opt></opt>','Labels'),(20,'CODE39',1,'BAR','Test Layout',0,'TR',10,'POINT',0,'L','barcode','<opt page_side="F" units="POINT">
   <images name="image_1" Dx="72" Ox="0" Oy="0" Sx="0" Sy="0" Tx="4.5" Ty="63">
     <data_source image_name="none" image_source="patronimages" />
@@ -15,20 +14,15 @@ INSERT INTO `creator_layouts` (`layout_id`, `barcode_type`, `start_label`, `prin
   <text font="TR" font_size="6" llx="115" lly="65" text_alignment="L" />
 </opt>
 ','Patroncards');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
 UNLOCK TABLES;
 
-
 LOCK TABLES `creator_templates` WRITE;
-/*!40000 ALTER TABLE `creator_templates` DISABLE KEYS */;
 INSERT INTO `creator_templates` VALUES (1,1,'Avery 5160 | 1 x 2-5/8','3 columns, 10 rows of labels',8.5,11,2.63,1,0.139,0,0.35,0.23,3,10,0.13,0,'INCH','Labels'),(7,13,'Demco WS14942260','1\" X 1.5\" Spine Label | Setup for up to four lines of text',8.5,11,1.5,1,0.236,0,0.5,0.25,5,10,0.0625,0,'INCH','Labels'),(12,14,'Demco WS14942260','1\" X 1.5\" Spine Label | Setup for five lines of text',8.5,11,1.5,1,0.139,0,0.53,0.3,5,10,0.0625,0,'INCH','Labels'),(22,0,'DEFAULT TEMPLATE 01','Default description',0,5,0,0,0,0,0,0,0,0,0,0,'POINT','Labels'),(23,16,'HB-PC0001','A template for home brewed patron card forms',8.5,11,3.1875,1.9375,0,0,0.6875,0.875,2,4,0.4375,0.1875,'INCH','Patroncards');
-/*!40000 ALTER TABLE `creator_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
 LOCK TABLES `printers_profile` WRITE;
-/*!40000 ALTER TABLE `printers_profile` DISABLE KEYS */;
 INSERT INTO `printers_profile` VALUES (1,'Library Laser',1,'Bypass',-2,9,3,0,'POINT','Labels'),(11,'Library Laser',1,'Tray 1',0,0,0,0,'POINT','Labels'),(16,'Test Printer 01',23,'Test Bin',0,0,0,0,'POINT','Patroncards');
-/*!40000 ALTER TABLE `printers_profile` ENABLE KEYS */;
 UNLOCK TABLES;
+
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

diff --git a/installer/data/mysql/ru-RU/optional/print_labels.sql b/installer/data/mysql/ru-RU/optional/print_labels.sql
index 2cb1b27..54cd374 100644 (file)
--- a/installer/data/mysql/ru-RU/optional/print_labels.sql
+++ b/installer/data/mysql/ru-RU/optional/print_labels.sql
@@ -1,4 +1,6 @@
--- Label Templates
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+
 LOCK TABLES `creator_templates` WRITE;
 INSERT INTO `creator_templates`
 (template_id,template_code,template_desc,page_width,page_height,label_width,label_height,top_margin,left_margin,cols,rows,col_gap,row_gap,
@@ -11,14 +13,13 @@ VALUES
 (5,'Avery 8163','2 ряда x 5 рядов',8.5,11,4,2,0.5,0.17,2,5,0.2,0.01,'INCH'),
 (6,'cards','Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\"  [3x10] : эквивалент: Gaylord JD-ML3000',8.5,11,2.75,1.05,0.25,0,3,10,0.2,0.01,'INCH'),
 (7,'HB-PC0001','Шаблон для карточек посетителей домашнего изготовления',8.5,11,3.125,1.875,0.375,0.5625,2,5,1.125,0.1875,'INCH');
-
 UNLOCK TABLES; 
 
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 INSERT INTO `creator_layouts` VALUES
 (1,'CODE39',1,'BIBBAR','библио-запись и штрих-код',0,1,'TR',7,'POINT',0,'L','title, author, itemcallnumber', '<opt></opt>', 'Labels'),
 (2,'CODE39',1,'BAR','переменный',0,1,'TR',3,'POINT',0,'L','','','Labels');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
-
 UNLOCK TABLES;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

diff --git a/installer/data/mysql/uk-UA/optional/print_labels.sql b/installer/data/mysql/uk-UA/optional/print_labels.sql
index 8465bec..fd70f7f 100644 (file)
--- a/installer/data/mysql/uk-UA/optional/print_labels.sql
+++ b/installer/data/mysql/uk-UA/optional/print_labels.sql
@@ -1,7 +1,6 @@
-truncate creator_templates;
-truncate creator_layouts;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 
--- Label Templates
 LOCK TABLES `creator_templates` WRITE;
 INSERT INTO `creator_templates` (template_id,template_code,template_desc,page_width,page_height,label_width,label_height,top_margin,left_margin,cols,rows,col_gap,row_gap,
 units)
@@ -13,14 +12,13 @@ VALUES
 (5,'Avery 8163','2 ряди x 5 рядів',8.5,11,4,2,0.5,0.17,2,5,0.2,0.01,'INCH'),
 (6,'cards','Avery 5160 | 1 x 2-5/8 : 1 x 2-5/8\"  [3x10] : еквівалент: Gaylord JD-ML3000',8.5,11,2.75,1.05,0.25,0,3,10,0.2,0.01,'INCH'),
 (7,'HB-PC0001','Шаблон для карток відвідувачів домашнього виготовлення',8.5,11,3.125,1.875,0.375,0.5625,2,5,1.125,0.1875,'INCH');
-
 UNLOCK TABLES; 
 
 LOCK TABLES `creator_layouts` WRITE;
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
 INSERT INTO `creator_layouts` VALUES
 (1,'CODE39',1,'BIBBAR','бібліо-запис та штрих-код',0,1,'TR',7,'POINT',0,'L','title, author, itemcallnumber', '<opt></opt>', 'Labels'),
 (2,'CODE39',1,'BAR','змінний',0,1,'TR',3,'POINT',0,'L','','','Labels');
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
-
 UNLOCK TABLES;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;