From 07aefc2f1b11e7bbe4f9af203bc03c2ee35396f8 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 23 Sep 2025 19:56:13 +0100 Subject: [PATCH] Bug 38489: Schema Update Sponsored-by: ByWater Solutions Signed-off-by: Hannah Dunne-Howrie --- Koha/Schema/Result/FileTransport.pm | 25 +++++-- Koha/Schema/Result/VendorEdiAccount.pm | 92 +++++++++----------------- 2 files changed, 51 insertions(+), 66 deletions(-) diff --git a/Koha/Schema/Result/FileTransport.pm b/Koha/Schema/Result/FileTransport.pm index 9baff02b86e..79c4b6336a3 100644 --- a/Koha/Schema/Result/FileTransport.pm +++ b/Koha/Schema/Result/FileTransport.pm @@ -52,7 +52,7 @@ __PACKAGE__->table("file_transports"); data_type: 'enum' default_value: 'sftp' - extra: {list => ["ftp","sftp"]} + extra: {list => ["ftp","sftp","local"]} is_nullable: 0 =head2 passive @@ -125,7 +125,7 @@ __PACKAGE__->add_columns( { data_type => "enum", default_value => "sftp", - extra => { list => ["ftp", "sftp"] }, + extra => { list => ["ftp", "sftp", "local"] }, is_nullable => 0, }, "passive", @@ -165,9 +165,26 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("file_transport_id"); +=head1 RELATIONS -# Created by DBIx::Class::Schema::Loader v0.07051 @ 2025-09-15 14:28:35 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Mpw0xCAH2Jmoxv3V9fHJRw +=head2 vendor_edi_accounts + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "vendor_edi_accounts", + "Koha::Schema::Result::VendorEdiAccount", + { "foreign.file_transport_id" => "self.file_transport_id" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + + +# Created by DBIx::Class::Schema::Loader v0.07051 @ 2025-09-23 18:55:50 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PhzRy63/hkdrU9fyelSOug __PACKAGE__->add_columns( '+passive' => { is_boolean => 1 }, diff --git a/Koha/Schema/Result/VendorEdiAccount.pm b/Koha/Schema/Result/VendorEdiAccount.pm index 8a3d3fa79f5..0b260e04884 100644 --- a/Koha/Schema/Result/VendorEdiAccount.pm +++ b/Koha/Schema/Result/VendorEdiAccount.pm @@ -34,33 +34,6 @@ __PACKAGE__->table("vendor_edi_accounts"); data_type: 'mediumtext' is_nullable: 0 -=head2 host - - data_type: 'varchar' - is_nullable: 1 - size: 40 - -=head2 username - - data_type: 'varchar' - is_nullable: 1 - size: 40 - -=head2 password - - data_type: 'mediumtext' - is_nullable: 1 - -=head2 upload_port - - data_type: 'integer' - is_nullable: 1 - -=head2 download_port - - data_type: 'integer' - is_nullable: 1 - =head2 last_activity data_type: 'date' @@ -73,16 +46,6 @@ __PACKAGE__->table("vendor_edi_accounts"); is_foreign_key: 1 is_nullable: 1 -=head2 download_directory - - data_type: 'mediumtext' - is_nullable: 1 - -=head2 upload_directory - - data_type: 'mediumtext' - is_nullable: 1 - =head2 san data_type: 'varchar' @@ -103,13 +66,6 @@ __PACKAGE__->table("vendor_edi_accounts"); is_nullable: 1 size: 3 -=head2 transport - - data_type: 'varchar' - default_value: 'FTP' - is_nullable: 1 - size: 6 - =head2 quotes_enabled data_type: 'tinyint' @@ -153,6 +109,12 @@ __PACKAGE__->table("vendor_edi_accounts"); is_nullable: 0 size: 256 +=head2 file_transport_id + + data_type: 'integer' + is_foreign_key: 1 + is_nullable: 1 + =cut __PACKAGE__->add_columns( @@ -160,32 +122,16 @@ __PACKAGE__->add_columns( { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "description", { data_type => "mediumtext", is_nullable => 0 }, - "host", - { data_type => "varchar", is_nullable => 1, size => 40 }, - "username", - { data_type => "varchar", is_nullable => 1, size => 40 }, - "password", - { data_type => "mediumtext", is_nullable => 1 }, - "upload_port", - { data_type => "integer", is_nullable => 1 }, - "download_port", - { data_type => "integer", is_nullable => 1 }, "last_activity", { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, "vendor_id", { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, - "download_directory", - { data_type => "mediumtext", is_nullable => 1 }, - "upload_directory", - { data_type => "mediumtext", is_nullable => 1 }, "san", { data_type => "varchar", is_nullable => 1, size => 20 }, "standard", { data_type => "varchar", default_value => "EUR", is_nullable => 1, size => 3 }, "id_code_qualifier", { data_type => "varchar", default_value => 14, is_nullable => 1, size => 3 }, - "transport", - { data_type => "varchar", default_value => "FTP", is_nullable => 1, size => 6 }, "quotes_enabled", { data_type => "tinyint", default_value => 0, is_nullable => 0 }, "invoices_enabled", @@ -200,6 +146,8 @@ __PACKAGE__->add_columns( { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, "plugin", { data_type => "varchar", default_value => "", is_nullable => 0, size => 256 }, + "file_transport_id", + { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -231,6 +179,26 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); +=head2 file_transport + +Type: belongs_to + +Related object: L + +=cut + +__PACKAGE__->belongs_to( + "file_transport", + "Koha::Schema::Result::FileTransport", + { file_transport_id => "file_transport_id" }, + { + is_deferrable => 1, + join_type => "LEFT", + on_delete => "SET NULL", + on_update => "CASCADE", + }, +); + =head2 shipment_budget Type: belongs_to @@ -272,8 +240,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2024-04-19 16:25:44 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jenUF3Wx7J7F5270mLQMbw +# Created by DBIx::Class::Schema::Loader v0.07051 @ 2025-09-23 18:55:50 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eKyPktjU7CQ+Me3x3Mht0w __PACKAGE__->add_columns( '+auto_orders' => { is_boolean => 1 }, -- 2.51.0