[PATCH] Bug 2559 Added primary keys to tables per comments

[Nicole Engard]

---
 installer/data/mysql/kohastructure.sql |    6 ++++++
 installer/data/mysql/updatedatabase.pl |    9 +++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql
b/installer/data/mysql/kohastructure.sql
index a12f4fd..32b0ee6 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2154,6 +2154,8 @@ CREATE TABLE language_subtag_registry (
         type varchar(25), --
language-script-region-variant-extension-privateuse
         description varchar(25), -- only one of the possible
descriptions for ease of reference, see language_descriptions for the
complete list
         added date,
+        id int(11) NOT NULL auto_increment,
+        PRIMARY KEY  (`id`),
         KEY `subtag` (`subtag`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

@@ -2164,6 +2166,8 @@ DROP TABLE IF EXISTS language_rfc4646_to_iso639;
 CREATE TABLE language_rfc4646_to_iso639 (
         rfc4646_subtag varchar(25),
         iso639_2_code varchar(25),
+        id int(11) NOT NULL auto_increment,
+        PRIMARY KEY  (`id`),
         KEY `rfc4646_subtag` (`rfc4646_subtag`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

@@ -2173,6 +2177,8 @@ CREATE TABLE language_descriptions (
         type varchar(25),
         lang varchar(25),
         description varchar(255),
+        id int(11) NOT NULL auto_increment,
+        PRIMARY KEY  (`id`),
         KEY `lang` (`lang`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 8628af9..16cd3df 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2616,6 +2616,15 @@ $DBversion = '3.01.00.XXX';
      SetVersion ($DBversion);
      print "Upgrade to $DBversion done (Bug 2576 : Add OPACFinesTab
syspref)\n";
      }
+
+$DBversion = '3.01.00.XXX';
+     if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+     $dbh->do("ALTER TABLE `language_subtag_registry` ADD `id` INT(
11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY;");
+     $dbh->do("ALTER TABLE `language_rfc4646_to_iso639` ADD `id` INT(
11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY;");
+     $dbh->do("ALTER TABLE `language_descriptions` ADD `id` INT( 11 )
NOT NULL AUTO_INCREMENT PRIMARY KEY;");
+     SetVersion ($DBversion);
+     print "Upgrade to $DBversion done (Added primary keys to
language tables)\n";
+     }

 =item DropAllForeignKeys($table)

-- 
1.5.6.5

--001636ed69cc00a4e90471ff7e32
Content-Type: application/octet-stream; 
	name="0006-Bug-2559-Added-primary-keys-to-tables-per-comments.patch"
Content-Disposition: attachment; 
	filename="0006-Bug-2559-Added-primary-keys-to-tables-per-comments.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fyt96whl0

RnJvbSBlZjQ4NzFkZWRiNDY1MjMwZjE3ODUxMmM0NzU3MTgxMTcxOWU4YjVjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogVHVlLCAyNSBBdWcgMjAwOSAxMzowMDoyNCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIEJ1ZyAy
NTU5IEFkZGVkIHByaW1hcnkga2V5cyB0byB0YWJsZXMgcGVyIGNvbW1lbnRzCkNvbnRlbnQtVHlw
ZTogdGV4dC9wbGFpbjsgY2hhcnNldD0idXRmLTgiCgotLS0KIGluc3RhbGxlci9kYXRhL215c3Fs
L2tvaGFzdHJ1Y3R1cmUuc3FsIHwgICAgNiArKysrKysKIGluc3RhbGxlci9kYXRhL215c3FsL3Vw
ZGF0ZWRhdGFiYXNlLnBsIHwgICAgOSArKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5z
ZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbnN0YWxsZXIvZGF0YS9t
eXNxbC9rb2hhc3RydWN0dXJlLnNxbCBiL2luc3RhbGxlci9kYXRhL215c3FsL2tvaGFzdHJ1Y3R1
cmUuc3FsCmluZGV4IGExMmY0ZmQuLjMyYjBlZTYgMTAwNjQ0Ci0tLSBhL2luc3RhbGxlci9kYXRh
L215c3FsL2tvaGFzdHJ1Y3R1cmUuc3FsCisrKyBiL2luc3RhbGxlci9kYXRhL215c3FsL2tvaGFz
dHJ1Y3R1cmUuc3FsCkBAIC0yMTU0LDYgKzIxNTQsOCBAQCBDUkVBVEUgVEFCTEUgbGFuZ3VhZ2Vf
c3VidGFnX3JlZ2lzdHJ5ICgKICAgICAgICAgdHlwZSB2YXJjaGFyKDI1KSwgLS0gbGFuZ3VhZ2Ut
c2NyaXB0LXJlZ2lvbi12YXJpYW50LWV4dGVuc2lvbi1wcml2YXRldXNlCiAgICAgICAgIGRlc2Ny
aXB0aW9uIHZhcmNoYXIoMjUpLCAtLSBvbmx5IG9uZSBvZiB0aGUgcG9zc2libGUgZGVzY3JpcHRp
b25zIGZvciBlYXNlIG9mIHJlZmVyZW5jZSwgc2VlIGxhbmd1YWdlX2Rlc2NyaXB0aW9ucyBmb3Ig
dGhlIGNvbXBsZXRlIGxpc3QKICAgICAgICAgYWRkZWQgZGF0ZSwKKyAgICAgICAgaWQgaW50KDEx
KSBOT1QgTlVMTCBhdXRvX2luY3JlbWVudCwKKyAgICAgICAgUFJJTUFSWSBLRVkgIChgaWRgKSwK
ICAgICAgICAgS0VZIGBzdWJ0YWdgIChgc3VidGFnYCkKICkgRU5HSU5FPUlubm9EQiBERUZBVUxU
IENIQVJTRVQ9dXRmODsKIApAQCAtMjE2NCw2ICsyMTY2LDggQEAgRFJPUCBUQUJMRSBJRiBFWElT
VFMgbGFuZ3VhZ2VfcmZjNDY0Nl90b19pc282Mzk7CiBDUkVBVEUgVEFCTEUgbGFuZ3VhZ2VfcmZj
NDY0Nl90b19pc282MzkgKAogICAgICAgICByZmM0NjQ2X3N1YnRhZyB2YXJjaGFyKDI1KSwKICAg
ICAgICAgaXNvNjM5XzJfY29kZSB2YXJjaGFyKDI1KSwKKyAgICAgICAgaWQgaW50KDExKSBOT1Qg
TlVMTCBhdXRvX2luY3JlbWVudCwKKyAgICAgICAgUFJJTUFSWSBLRVkgIChgaWRgKSwKICAgICAg
ICAgS0VZIGByZmM0NjQ2X3N1YnRhZ2AgKGByZmM0NjQ2X3N1YnRhZ2ApCiApIEVOR0lORT1Jbm5v
REIgREVGQVVMVCBDSEFSU0VUPXV0Zjg7CiAKQEAgLTIxNzMsNiArMjE3Nyw4IEBAIENSRUFURSBU
QUJMRSBsYW5ndWFnZV9kZXNjcmlwdGlvbnMgKAogICAgICAgICB0eXBlIHZhcmNoYXIoMjUpLAog
ICAgICAgICBsYW5nIHZhcmNoYXIoMjUpLAogICAgICAgICBkZXNjcmlwdGlvbiB2YXJjaGFyKDI1
NSksCisgICAgICAgIGlkIGludCgxMSkgTk9UIE5VTEwgYXV0b19pbmNyZW1lbnQsCisgICAgICAg
IFBSSU1BUlkgS0VZICAoYGlkYCksCiAgICAgICAgIEtFWSBgbGFuZ2AgKGBsYW5nYCkKICkgRU5H
SU5FPUlubm9EQiBERUZBVUxUIENIQVJTRVQ9dXRmODsKIApkaWZmIC0tZ2l0IGEvaW5zdGFsbGVy
L2RhdGEvbXlzcWwvdXBkYXRlZGF0YWJhc2UucGwgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC91cGRh
dGVkYXRhYmFzZS5wbAppbmRleCA4NjI4YWY5Li4xNmNkM2RmIDEwMDc1NQotLS0gYS9pbnN0YWxs
ZXIvZGF0YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNx
bC91cGRhdGVkYXRhYmFzZS5wbApAQCAtMjYxNiw2ICsyNjE2LDE1IEBAICREQnZlcnNpb24gPSAn
My4wMS4wMC5YWFgnOwogICAgICBTZXRWZXJzaW9uICgkREJ2ZXJzaW9uKTsKICAgICAgcHJpbnQg
IlVwZ3JhZGUgdG8gJERCdmVyc2lvbiBkb25lIChCdWcgMjU3NiA6IEFkZCBPUEFDRmluZXNUYWIg
c3lzcHJlZilcbiI7CiAgICAgIH0gICAgCisgICAgIAorJERCdmVyc2lvbiA9ICczLjAxLjAwLlhY
WCc7CisgICAgIGlmIChDNDo6Q29udGV4dC0+cHJlZmVyZW5jZSgiVmVyc2lvbiIpIDwgVHJhbnNm
b3JtVG9OdW0oJERCdmVyc2lvbikpIHsKKyAgICAgJGRiaC0+ZG8oIkFMVEVSIFRBQkxFIGBsYW5n
dWFnZV9zdWJ0YWdfcmVnaXN0cnlgIEFERCBgaWRgIElOVCggMTEgKSBOT1QgTlVMTCBBVVRPX0lO
Q1JFTUVOVCBQUklNQVJZIEtFWTsiKTsKKyAgICAgJGRiaC0+ZG8oIkFMVEVSIFRBQkxFIGBsYW5n
dWFnZV9yZmM0NjQ2X3RvX2lzbzYzOWAgQUREIGBpZGAgSU5UKCAxMSApIE5PVCBOVUxMIEFVVE9f
SU5DUkVNRU5UIFBSSU1BUlkgS0VZOyIpOworICAgICAkZGJoLT5kbygiQUxURVIgVEFCTEUgYGxh
bmd1YWdlX2Rlc2NyaXB0aW9uc2AgQUREIGBpZGAgSU5UKCAxMSApIE5PVCBOVUxMIEFVVE9fSU5D
UkVNRU5UIFBSSU1BUlkgS0VZOyIpOworICAgICBTZXRWZXJzaW9uICgkREJ2ZXJzaW9uKTsKKyAg
ICAgcHJpbnQgIlVwZ3JhZGUgdG8gJERCdmVyc2lvbiBkb25lIChBZGRlZCBwcmltYXJ5IGtleXMg
dG8gbGFuZ3VhZ2UgdGFibGVzKVxuIjsKKyAgICAgfSAgICAKIAogPWl0ZW0gRHJvcEFsbEZvcmVp
Z25LZXlzKCR0YWJsZSkKIAotLSAKMS41LjYuNQoK
--001636ed69cc00a4e90471ff7e32--