@@ -, +, @@ --- api/v1/swagger/definitions/vendor_alias.yaml | 2 +- installer/data/mysql/atomicupdate/bug_33103.pl | 4 ++-- installer/data/mysql/kohastructure.sql | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) --- a/api/v1/swagger/definitions/vendor_alias.yaml +++ a/api/v1/swagger/definitions/vendor_alias.yaml @@ -1,7 +1,7 @@ --- type: object properties: - id: + alias_id: description: Internal ID for the extended attribute type: integer vendor_id: --- a/installer/data/mysql/atomicupdate/bug_33103.pl +++ a/installer/data/mysql/atomicupdate/bug_33103.pl @@ -9,10 +9,10 @@ return { unless ( TableExists('aqbookseller_aliases') ) { $dbh->do(q{ CREATE TABLE `aqbookseller_aliases` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'primary key and unique identifier assigned by Koha', + `alias_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'primary key and unique identifier assigned by Koha', `vendor_id` int(11) NOT NULL COMMENT 'link to the vendor', `alias` varchar(255) NOT NULL COMMENT "the alias", - PRIMARY KEY (`id`), + PRIMARY KEY (`alias_id`), CONSTRAINT `aqbookseller_aliases_ibfk_1` FOREIGN KEY (`vendor_id`) REFERENCES `aqbooksellers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; }); --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -432,10 +432,10 @@ DROP TABLE IF EXISTS `aqbookseller_aliases`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `aqbookseller_aliases` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'primary key and unique identifier assigned by Koha', + `alias_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'primary key and unique identifier assigned by Koha', `vendor_id` int(11) NOT NULL COMMENT 'link to the vendor', `alias` varchar(255) NOT NULL COMMENT "the alias", - PRIMARY KEY (`id`), + PRIMARY KEY (`alias_id`), CONSTRAINT `aqbookseller_aliases_ibfk_1` FOREIGN KEY (`vendor_id`) REFERENCES `aqbooksellers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --