Bugzilla – Attachment 29648 Details for
Bug 12558
DBIx::Class schema update 07/2014
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12558: DBIx::Class schema update 07/2014
PASSED-QA-Bug-12558-DBIxClass-schema-update-072014.patch (text/plain), 30.79 KB, created by
Kyle M Hall
on 2014-07-11 15:47:30 UTC
(
hide
)
Description:
[PASSED QA] Bug 12558: DBIx::Class schema update 07/2014
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2014-07-11 15:47:30 UTC
Size:
30.79 KB
patch
obsolete
>From ee278077ded89c69cd744dddb82ba9aa53db621b Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Fri, 11 Jul 2014 09:39:11 -0300 >Subject: [PATCH] [PASSED QA] Bug 12558: DBIx::Class schema update 07/2014 > >Needed DBIx::Class schema update to keep sync with current kohastructure.sql. > >Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> >Signed-off-by: Yohann Dufour <dufour.yohann@gmail.com> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > Koha/Schema/Result/Accountline.pm | 8 +- > Koha/Schema/Result/Aqbasket.pm | 14 ++-- > Koha/Schema/Result/Aqinvoice.pm | 6 +- > Koha/Schema/Result/Aqorder.pm | 8 +- > Koha/Schema/Result/AqordersTransfer.pm | 8 +- > Koha/Schema/Result/AuthorisedValuesBranch.pm | 8 +- > Koha/Schema/Result/Borrower.pm | 8 +- > Koha/Schema/Result/BorrowerAttributeTypesBranch.pm | 8 +- > Koha/Schema/Result/CategoriesBranch.pm | 8 +- > Koha/Schema/Result/ClassSource.pm | 6 +- > Koha/Schema/Result/CollectionsTracking.pm | 77 ++++++++++++++++++++ > Koha/Schema/Result/CourseInstructor.pm | 6 +- > Koha/Schema/Result/CourseReserve.pm | 6 +- > Koha/Schema/Result/CreatorBatch.pm | 8 +- > Koha/Schema/Result/ImportRecord.pm | 12 ++-- > Koha/Schema/Result/ImportRecordMatch.pm | 77 ++++++++++++++++++++ > Koha/Schema/Result/Issue.pm | 8 +- > Koha/Schema/Result/Item.pm | 8 +- > Koha/Schema/Result/MessageQueue.pm | 6 +- > Koha/Schema/Result/OldIssue.pm | 12 ++-- > Koha/Schema/Result/OldReserve.pm | 16 ++-- > Koha/Schema/Result/Review.pm | 6 +- > Koha/Schema/Result/Subscription.pm | 8 +- > Koha/Schema/Result/Virtualshelfcontent.pm | 8 +- > Koha/Schema/Result/Virtualshelfshare.pm | 8 +- > Koha/Schema/Result/Virtualshelve.pm | 8 +- > Koha/Schema/Result/Z3950server.pm | 8 +- > 27 files changed, 259 insertions(+), 105 deletions(-) > create mode 100644 Koha/Schema/Result/CollectionsTracking.pm > create mode 100644 Koha/Schema/Result/ImportRecordMatch.pm > >diff --git a/Koha/Schema/Result/Accountline.pm b/Koha/Schema/Result/Accountline.pm >index 3b977fa..e83ef40 100644 >--- a/Koha/Schema/Result/Accountline.pm >+++ b/Koha/Schema/Result/Accountline.pm >@@ -208,14 +208,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VLEuOBmnS+xgk7LXAqxtLw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jUiCeLLPg5228rNEBW0w2g > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqbasket.pm b/Koha/Schema/Result/Aqbasket.pm >index 7b5f5fe..fbf1185 100644 >--- a/Koha/Schema/Result/Aqbasket.pm >+++ b/Koha/Schema/Result/Aqbasket.pm >@@ -203,7 +203,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "RESTRICT", > on_update => "CASCADE", > }, > ); >@@ -220,7 +220,7 @@ __PACKAGE__->belongs_to( > "booksellerid", > "Koha::Schema::Result::Aqbookseller", > { id => "booksellerid" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "CASCADE" }, > ); > > =head2 branch >@@ -238,7 +238,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -258,8 +258,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "RESTRICT", >+ on_update => "RESTRICT", > }, > ); > >@@ -274,8 +274,8 @@ Composing rels: L</aqbasketusers> -> borrowernumber > __PACKAGE__->many_to_many("borrowernumbers", "aqbasketusers", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-31 16:31:18 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TCssMGPEqtE0MZ5INCufoA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pT+YFf9nfD/dmBuE4RNCFw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqinvoice.pm b/Koha/Schema/Result/Aqinvoice.pm >index c063d30..ce68093 100644 >--- a/Koha/Schema/Result/Aqinvoice.pm >+++ b/Koha/Schema/Result/Aqinvoice.pm >@@ -150,14 +150,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nV0lYm2w4xX8cwVmTVF3YQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3se4f767VfvBKaZ8tlXwHQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqorder.pm b/Koha/Schema/Result/Aqorder.pm >index a4bb26c..b47a569 100644 >--- a/Koha/Schema/Result/Aqorder.pm >+++ b/Koha/Schema/Result/Aqorder.pm >@@ -421,7 +421,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -441,7 +441,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -467,8 +467,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-04-19 15:25:43 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XGQHKw2/pml/kFe89vbvXw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:u5KHnXS5hMmqpqufIEkPig > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/AqordersTransfer.pm b/Koha/Schema/Result/AqordersTransfer.pm >index 0a4ec88..68008ba 100644 >--- a/Koha/Schema/Result/AqordersTransfer.pm >+++ b/Koha/Schema/Result/AqordersTransfer.pm >@@ -101,7 +101,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -121,14 +121,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1WX3cQyoYmNmPed+OqdUNA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Z6+vESlzZKjZloNvrEHpxA > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/AuthorisedValuesBranch.pm b/Koha/Schema/Result/AuthorisedValuesBranch.pm >index 0c6e2d9..35bb493 100644 >--- a/Koha/Schema/Result/AuthorisedValuesBranch.pm >+++ b/Koha/Schema/Result/AuthorisedValuesBranch.pm >@@ -63,7 +63,7 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_update => "RESTRICT", > }, > ); > >@@ -83,13 +83,13 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_update => "RESTRICT", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:k6hCbzMVZ1VRsubvdrZMYQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FlVw5Eu4bXF2ygD0QkwwCg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm >index 3d9f9ae..b1f9e6f 100644 >--- a/Koha/Schema/Result/Borrower.pm >+++ b/Koha/Schema/Result/Borrower.pm >@@ -708,7 +708,7 @@ __PACKAGE__->belongs_to( > "branchcode", > "Koha::Schema::Result::Branch", > { branchcode => "branchcode" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, > ); > > =head2 categorycode >@@ -723,7 +723,7 @@ __PACKAGE__->belongs_to( > "categorycode", > "Koha::Schema::Result::Category", > { categorycode => "categorycode" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, > ); > > =head2 course_instructors >@@ -1072,8 +1072,8 @@ Composing rels: L</course_instructors> -> course > __PACKAGE__->many_to_many("courses", "course_instructors", "course"); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-31 16:31:19 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:z4kW3xYX1CyrwvGdZu32nA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5cfpOojccKCoVRMj+0mWHg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm b/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm >index 362b5cc..2345170 100644 >--- a/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm >+++ b/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm >@@ -64,7 +64,7 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_update => "RESTRICT", > }, > ); > >@@ -84,13 +84,13 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_update => "RESTRICT", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/ppDBtfKZvUNcERWFbLuuw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MA/VDd/K/RTgZ9TLy0K1gw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/CategoriesBranch.pm b/Koha/Schema/Result/CategoriesBranch.pm >index 584c177..2a0959e 100644 >--- a/Koha/Schema/Result/CategoriesBranch.pm >+++ b/Koha/Schema/Result/CategoriesBranch.pm >@@ -64,7 +64,7 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_update => "RESTRICT", > }, > ); > >@@ -84,13 +84,13 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_update => "RESTRICT", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9fXKFDUQsOx+uqF+slRhSw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5NpXKN72zzNcHauiDZfdEA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/ClassSource.pm b/Koha/Schema/Result/ClassSource.pm >index a0b27cd..c6de4c4 100644 >--- a/Koha/Schema/Result/ClassSource.pm >+++ b/Koha/Schema/Result/ClassSource.pm >@@ -94,12 +94,12 @@ __PACKAGE__->belongs_to( > "class_sort_rule", > "Koha::Schema::Result::ClassSortRule", > { class_sort_rule => "class_sort_rule" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OPkfouKUejU6oCgy58yt6Q >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2O58Q7wdbfAl6xmiW02PAA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/CollectionsTracking.pm b/Koha/Schema/Result/CollectionsTracking.pm >new file mode 100644 >index 0000000..c25bb06 >--- /dev/null >+++ b/Koha/Schema/Result/CollectionsTracking.pm >@@ -0,0 +1,77 @@ >+use utf8; >+package Koha::Schema::Result::CollectionsTracking; >+ >+# Created by DBIx::Class::Schema::Loader >+# DO NOT MODIFY THE FIRST PART OF THIS FILE >+ >+=head1 NAME >+ >+Koha::Schema::Result::CollectionsTracking >+ >+=cut >+ >+use strict; >+use warnings; >+ >+use base 'DBIx::Class::Core'; >+ >+=head1 TABLE: C<collections_tracking> >+ >+=cut >+ >+__PACKAGE__->table("collections_tracking"); >+ >+=head1 ACCESSORS >+ >+=head2 collections_tracking_id >+ >+ data_type: 'integer' >+ is_auto_increment: 1 >+ is_nullable: 0 >+ >+=head2 colid >+ >+ data_type: 'integer' >+ default_value: 0 >+ is_nullable: 0 >+ >+collections.colId >+ >+=head2 itemnumber >+ >+ data_type: 'integer' >+ default_value: 0 >+ is_nullable: 0 >+ >+items.itemnumber >+ >+=cut >+ >+__PACKAGE__->add_columns( >+ "collections_tracking_id", >+ { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >+ "colid", >+ { data_type => "integer", default_value => 0, is_nullable => 0 }, >+ "itemnumber", >+ { data_type => "integer", default_value => 0, is_nullable => 0 }, >+); >+ >+=head1 PRIMARY KEY >+ >+=over 4 >+ >+=item * L</collections_tracking_id> >+ >+=back >+ >+=cut >+ >+__PACKAGE__->set_primary_key("collections_tracking_id"); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aV5bgiXNrskXo+q+WLuwPg >+ >+ >+# You can replace this text with custom code or comments, and it will be preserved on regeneration >+1; >diff --git a/Koha/Schema/Result/CourseInstructor.pm b/Koha/Schema/Result/CourseInstructor.pm >index c1d183c..1049475 100644 >--- a/Koha/Schema/Result/CourseInstructor.pm >+++ b/Koha/Schema/Result/CourseInstructor.pm >@@ -87,12 +87,12 @@ __PACKAGE__->belongs_to( > "course", > "Koha::Schema::Result::Course", > { course_id => "course_id" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dIemqF/uRWLNN4IMCHZxRA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7vP3bJ0YA6LEepYOaNg++A > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/CourseReserve.pm b/Koha/Schema/Result/CourseReserve.pm >index bb937b2..9cfdfab 100644 >--- a/Koha/Schema/Result/CourseReserve.pm >+++ b/Koha/Schema/Result/CourseReserve.pm >@@ -121,12 +121,12 @@ __PACKAGE__->belongs_to( > "course", > "Koha::Schema::Result::Course", > { course_id => "course_id" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9KuuUyFReuw+PAlLW84yXQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SSTJhsNOuUlxr/CsDs08pQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/CreatorBatch.pm b/Koha/Schema/Result/CreatorBatch.pm >index 3fdc97c..7049950 100644 >--- a/Koha/Schema/Result/CreatorBatch.pm >+++ b/Koha/Schema/Result/CreatorBatch.pm >@@ -150,7 +150,7 @@ __PACKAGE__->belongs_to( > "branch_code", > "Koha::Schema::Result::Branch", > { branchcode => "branch_code" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "CASCADE", on_update => "RESTRICT" }, > ); > > =head2 item_number >@@ -169,13 +169,13 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_update => "RESTRICT", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:w5Nfrm8a8ajsC0bLBACaWg >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:x9PaYKzfg8jT6zFP4IwhBA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/ImportRecord.pm b/Koha/Schema/Result/ImportRecord.pm >index c010138..2d27bd8 100644 >--- a/Koha/Schema/Result/ImportRecord.pm >+++ b/Koha/Schema/Result/ImportRecord.pm >@@ -254,24 +254,24 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >-=head2 import_records_matches >+=head2 import_record_matches > > Type: has_many > >-Related object: L<Koha::Schema::Result::ImportRecordMatches> >+Related object: L<Koha::Schema::Result::ImportRecordMatch> > > =cut > > __PACKAGE__->has_many( >- "import_records_matches", >- "Koha::Schema::Result::ImportRecordMatches", >+ "import_record_matches", >+ "Koha::Schema::Result::ImportRecordMatch", > { "foreign.import_record_id" => "self.import_record_id" }, > { cascade_copy => 0, cascade_delete => 0 }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:e71umJ0QmfPBvlxmzbClng >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jhzXlqw5mA1lGsI9SZEv/Q > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/ImportRecordMatch.pm b/Koha/Schema/Result/ImportRecordMatch.pm >new file mode 100644 >index 0000000..0ea5d56 >--- /dev/null >+++ b/Koha/Schema/Result/ImportRecordMatch.pm >@@ -0,0 +1,77 @@ >+use utf8; >+package Koha::Schema::Result::ImportRecordMatch; >+ >+# Created by DBIx::Class::Schema::Loader >+# DO NOT MODIFY THE FIRST PART OF THIS FILE >+ >+=head1 NAME >+ >+Koha::Schema::Result::ImportRecordMatch >+ >+=cut >+ >+use strict; >+use warnings; >+ >+use base 'DBIx::Class::Core'; >+ >+=head1 TABLE: C<import_record_matches> >+ >+=cut >+ >+__PACKAGE__->table("import_record_matches"); >+ >+=head1 ACCESSORS >+ >+=head2 import_record_id >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 0 >+ >+=head2 candidate_match_id >+ >+ data_type: 'integer' >+ is_nullable: 0 >+ >+=head2 score >+ >+ data_type: 'integer' >+ default_value: 0 >+ is_nullable: 0 >+ >+=cut >+ >+__PACKAGE__->add_columns( >+ "import_record_id", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ "candidate_match_id", >+ { data_type => "integer", is_nullable => 0 }, >+ "score", >+ { data_type => "integer", default_value => 0, is_nullable => 0 }, >+); >+ >+=head1 RELATIONS >+ >+=head2 import_record >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::ImportRecord> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "import_record", >+ "Koha::Schema::Result::ImportRecord", >+ { import_record_id => "import_record_id" }, >+ { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hJW36EeP+H8+0/Ij3iuIFw >+ >+ >+# You can replace this text with custom code or comments, and it will be preserved on regeneration >+1; >diff --git a/Koha/Schema/Result/Issue.pm b/Koha/Schema/Result/Issue.pm >index e1838b6..2b3e3fd 100644 >--- a/Koha/Schema/Result/Issue.pm >+++ b/Koha/Schema/Result/Issue.pm >@@ -154,7 +154,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "RESTRICT", > on_update => "CASCADE", > }, > ); >@@ -174,14 +174,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "RESTRICT", > on_update => "CASCADE", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZEh31EKBmURMKxDxI+H3EA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2SJJ3az4Ml9hKEQvNH3+Kw > > __PACKAGE__->belongs_to( > "borrower", >diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm >index fd50d15..67e1d7c 100644 >--- a/Koha/Schema/Result/Item.pm >+++ b/Koha/Schema/Result/Item.pm >@@ -508,7 +508,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "RESTRICT", > on_update => "CASCADE", > }, > ); >@@ -528,7 +528,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "RESTRICT", > on_update => "CASCADE", > }, > ); >@@ -609,8 +609,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-12-19 06:29:02 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:h6fPG62SifJ5T8QKPZNBBw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Rc89LTrsDtt8Y6yXVUdhMA > > __PACKAGE__->belongs_to( > "biblio", >diff --git a/Koha/Schema/Result/MessageQueue.pm b/Koha/Schema/Result/MessageQueue.pm >index 417cd78..6612db5 100644 >--- a/Koha/Schema/Result/MessageQueue.pm >+++ b/Koha/Schema/Result/MessageQueue.pm >@@ -165,12 +165,12 @@ __PACKAGE__->belongs_to( > "message_transport_type", > "Koha::Schema::Result::MessageTransportType", > { message_transport_type => "message_transport_type" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "CASCADE" }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+gmGYPCtwCYKHAzfd9xByQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YWxM2O2W/h34qqIOIpzOtw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OldIssue.pm b/Koha/Schema/Result/OldIssue.pm >index 4050f06..e6d664b 100644 >--- a/Koha/Schema/Result/OldIssue.pm >+++ b/Koha/Schema/Result/OldIssue.pm >@@ -154,8 +154,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > >@@ -174,14 +174,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uPOxNROoMMRZ0qZsXsxEjA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sgsDHihVYHrTycbaqoGbaQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OldReserve.pm b/Koha/Schema/Result/OldReserve.pm >index 84ba18c..942480f 100644 >--- a/Koha/Schema/Result/OldReserve.pm >+++ b/Koha/Schema/Result/OldReserve.pm >@@ -215,8 +215,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > >@@ -235,8 +235,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > >@@ -255,14 +255,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:g/WiYGPOyzJGtMWiAHvIxA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CMfQmK2sJxQB0FBb0X12ug > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Review.pm b/Koha/Schema/Result/Review.pm >index 37b822d..64ee4ad 100644 >--- a/Koha/Schema/Result/Review.pm >+++ b/Koha/Schema/Result/Review.pm >@@ -127,14 +127,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/gg7wEkOzJ7yI3UXoDcQKA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:u+R08bCdVQA697aPo9zEUA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Subscription.pm b/Koha/Schema/Result/Subscription.pm >index 91e408c..62468a0 100644 >--- a/Koha/Schema/Result/Subscription.pm >+++ b/Koha/Schema/Result/Subscription.pm >@@ -388,7 +388,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -408,7 +408,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -429,8 +429,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-30 02:42:01 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JoTdms86n/xfPo8YUnDHUQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:57kc1/B3eNKQXAk9tlOy0A > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Virtualshelfcontent.pm b/Koha/Schema/Result/Virtualshelfcontent.pm >index dfb8d46..906a058 100644 >--- a/Koha/Schema/Result/Virtualshelfcontent.pm >+++ b/Koha/Schema/Result/Virtualshelfcontent.pm >@@ -117,8 +117,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > >@@ -138,8 +138,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nhcu0n7BoSNsoY76SYSYFw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ie3Gx+/HthZQ/4fHjcPF0w > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Virtualshelfshare.pm b/Koha/Schema/Result/Virtualshelfshare.pm >index 93aa7dd..0adaf2b 100644 >--- a/Koha/Schema/Result/Virtualshelfshare.pm >+++ b/Koha/Schema/Result/Virtualshelfshare.pm >@@ -101,8 +101,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > >@@ -122,8 +122,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Eu/4NPwsXI+UMs5QWVsUmA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gle9hUqefRoNSilv0gFc1w > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Virtualshelve.pm b/Koha/Schema/Result/Virtualshelve.pm >index fa4759d..1811b4c 100644 >--- a/Koha/Schema/Result/Virtualshelve.pm >+++ b/Koha/Schema/Result/Virtualshelve.pm >@@ -135,8 +135,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "SET NULL", >+ on_update => "SET NULL", > }, > ); > >@@ -171,8 +171,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WdBpWgSdrE0l13vKgDRcGg >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xRDCzpS+CXPdp4Mlp2WP6A > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Z3950server.pm b/Koha/Schema/Result/Z3950server.pm >index a185f57..8dbf566 100644 >--- a/Koha/Schema/Result/Z3950server.pm >+++ b/Koha/Schema/Result/Z3950server.pm >@@ -94,7 +94,7 @@ __PACKAGE__->table("z3950servers"); > > data_type: 'enum' > default_value: 'primary' >- extra: {list => ["primary","secondary"]} >+ extra: {list => ["primary","secondary",""]} > is_nullable: 0 > > =head2 type >@@ -152,7 +152,7 @@ __PACKAGE__->add_columns( > { > data_type => "enum", > default_value => "primary", >- extra => { list => ["primary", "secondary"] }, >+ extra => { list => ["primary", "secondary", ""] }, > is_nullable => 0, > }, > "type", >@@ -188,8 +188,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("id"); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:j/AgGQDMyR5wm1wooSYYDw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BA+II2AVWOTLfgbko1GAOA > > > # You can replace this text with custom content, and it will be preserved on regeneration >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12558
:
29633
|
29634
|
29642
|
29643
|
29648
|
29649
|
29655
|
29656
|
29657