From a8ff6482108844dadf3b3927913157533e0fa11d Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Sat, 30 Aug 2025 12:29:55 -0300 Subject: [PATCH] Bug 39190: Rename id => file_transport_id and remove mapping Signed-off-by: Tomas Cohen Arazi --- Koha/Schema/Result/FileTransport.pm | 12 ++++++------ .../bug_35761-add_SFTP_tables_and_perm.pl | 4 ++-- installer/data/mysql/kohastructure.sql | 4 ++-- t/db_dependent/Koha/File/Transports.t | 3 ++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Koha/Schema/Result/FileTransport.pm b/Koha/Schema/Result/FileTransport.pm index 8705d8ff326..9baff02b86e 100644 --- a/Koha/Schema/Result/FileTransport.pm +++ b/Koha/Schema/Result/FileTransport.pm @@ -23,7 +23,7 @@ __PACKAGE__->table("file_transports"); =head1 ACCESSORS -=head2 id +=head2 file_transport_id data_type: 'integer' is_auto_increment: 1 @@ -108,7 +108,7 @@ __PACKAGE__->table("file_transports"); =cut __PACKAGE__->add_columns( - "id", + "file_transport_id", { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "name", { data_type => "varchar", is_nullable => 0, size => 80 }, @@ -157,17 +157,17 @@ __PACKAGE__->add_columns( =over 4 -=item * L +=item * L =back =cut -__PACKAGE__->set_primary_key("id"); +__PACKAGE__->set_primary_key("file_transport_id"); -# Created by DBIx::Class::Schema::Loader v0.07051 @ 2025-08-29 20:23:47 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eeoKreXE9wfz12s4ENo5Tg +# Created by DBIx::Class::Schema::Loader v0.07051 @ 2025-09-15 14:28:35 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Mpw0xCAH2Jmoxv3V9fHJRw __PACKAGE__->add_columns( '+passive' => { is_boolean => 1 }, diff --git a/installer/data/mysql/atomicupdate/bug_35761-add_SFTP_tables_and_perm.pl b/installer/data/mysql/atomicupdate/bug_35761-add_SFTP_tables_and_perm.pl index 653254df040..43e18e162d2 100755 --- a/installer/data/mysql/atomicupdate/bug_35761-add_SFTP_tables_and_perm.pl +++ b/installer/data/mysql/atomicupdate/bug_35761-add_SFTP_tables_and_perm.pl @@ -19,7 +19,7 @@ return { $dbh->do( q { CREATE TABLE `file_transports` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `file_transport_id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(80) NOT NULL, `host` varchar(80) NOT NULL DEFAULT 'localhost', `port` int(11) NOT NULL DEFAULT 22, @@ -33,7 +33,7 @@ return { `upload_directory` mediumtext DEFAULT NULL, `status` longtext DEFAULT NULL, `debug` tinyint(1) NOT NULL DEFAULT 0, - PRIMARY KEY (`id`), + PRIMARY KEY (`file_transport_id`), KEY `host_idx` (`host`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; } diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 913df47cb1b..948683dc43b 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -5996,7 +5996,7 @@ DROP TABLE IF EXISTS `file_transports`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `file_transports` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `file_transport_id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(80) NOT NULL, `host` varchar(80) NOT NULL DEFAULT 'localhost', `port` int(11) NOT NULL DEFAULT 22, @@ -6010,7 +6010,7 @@ CREATE TABLE `file_transports` ( `upload_directory` mediumtext DEFAULT NULL, `status` longtext DEFAULT NULL, `debug` tinyint(1) NOT NULL DEFAULT 0, - PRIMARY KEY (`id`), + PRIMARY KEY (`file_transport_id`), KEY `host_idx` (`host`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/t/db_dependent/Koha/File/Transports.t b/t/db_dependent/Koha/File/Transports.t index 21fb5f9cc08..a2171bb7a81 100755 --- a/t/db_dependent/Koha/File/Transports.t +++ b/t/db_dependent/Koha/File/Transports.t @@ -94,7 +94,8 @@ subtest 'search() tests' => sub { ); # Search for both transports - my $transports = Koha::File::Transports->search( { id => { -in => [ $sftp_transport->id, $ftp_transport->id ] } } ); + my $transports = Koha::File::Transports->search( + { file_transport_id => { -in => [ $sftp_transport->id, $ftp_transport->id ] } } ); is( ref($transports), 'Koha::File::Transports', -- 2.51.0