From 3a4299327b83fdbd7e6246f8c069436fe83e2e79 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 19 Aug 2015 07:57:17 -0400 Subject: [PATCH] Bug 11431: (QA followup) Simplify audio_alert_id to just id Signed-off-by: Katrin Fischer --- Koha/Schema/Result/AudioAlert.pm | 12 ++++++------ installer/data/mysql/kohastructure.sql | 4 ++-- installer/data/mysql/updatedatabase.pl | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Koha/Schema/Result/AudioAlert.pm b/Koha/Schema/Result/AudioAlert.pm index 696040be26..24b2927a7f 100644 --- a/Koha/Schema/Result/AudioAlert.pm +++ b/Koha/Schema/Result/AudioAlert.pm @@ -23,7 +23,7 @@ __PACKAGE__->table("audio_alerts"); =head1 ACCESSORS -=head2 audio_alert_id +=head2 id data_type: 'integer' is_auto_increment: 1 @@ -50,7 +50,7 @@ __PACKAGE__->table("audio_alerts"); =cut __PACKAGE__->add_columns( - "audio_alert_id", + "id", { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "precedence", { data_type => "smallint", extra => { unsigned => 1 }, is_nullable => 0 }, @@ -64,17 +64,17 @@ __PACKAGE__->add_columns( =over 4 -=item * L +=item * L =back =cut -__PACKAGE__->set_primary_key("audio_alert_id"); +__PACKAGE__->set_primary_key("id"); -# Created by DBIx::Class::Schema::Loader v0.07040 @ 2014-12-22 01:04:21 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yIXpJMcpovBDl3bBVrwLqg +# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-08-19 08:01:06 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lPTnmrJd5V/X9fLebC8FHA # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 6cc013387f..76ee26b6b1 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -3587,11 +3587,11 @@ CREATE TABLE `localization` ( DROP TABLE IF EXISTS audio_alerts; CREATE TABLE audio_alerts ( - audio_alert_id int(11) NOT NULL AUTO_INCREMENT, + id int(11) NOT NULL AUTO_INCREMENT, precedence smallint(5) unsigned NOT NULL, selector varchar(255) NOT NULL, sound varchar(255) NOT NULL, - PRIMARY KEY (audio_alert_id), + PRIMARY KEY (id), KEY precedence (precedence) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index b5301284fc..e3decbe136 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9678,11 +9678,11 @@ if ( CheckVersion($DBversion) ) { $dbh->do(q{ CREATE TABLE audio_alerts ( - audio_alert_id int(11) NOT NULL AUTO_INCREMENT, + id int(11) NOT NULL AUTO_INCREMENT, precedence smallint(5) unsigned NOT NULL, selector varchar(255) NOT NULL, sound varchar(255) NOT NULL, - PRIMARY KEY (audio_alert_id), + PRIMARY KEY (id), KEY precedence (precedence) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; }); -- 2.39.5