Bugzilla – Attachment 82456 Details for
Bug 20581
Allow manual selection of custom ILL request statuses
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20581: DO NOT PUSH: Updated Schema Files.
Bug-20581-DO-NOT-PUSH-Updated-Schema-Files.patch (text/plain), 84.05 KB, created by
Andrew Isherwood
on 2018-11-19 12:15:52 UTC
(
hide
)
Description:
Bug 20581: DO NOT PUSH: Updated Schema Files.
Filename:
MIME Type:
Creator:
Andrew Isherwood
Created:
2018-11-19 12:15:52 UTC
Size:
84.05 KB
patch
obsolete
>From 713902876c133a0e912e853db376c52d54c103df Mon Sep 17 00:00:00 2001 >From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> >Date: Thu, 8 Nov 2018 11:59:46 +0000 >Subject: [PATCH] Bug 20581: DO NOT PUSH: Updated Schema Files. > >Signed-off-by: Niamh.Walker-Headon@it-tallaght.ie >--- > Koha/Schema/Result/Aqbasket.pm | 6 +- > Koha/Schema/Result/Aqbasketgroup.pm | 8 +- > Koha/Schema/Result/Aqbookseller.pm | 25 ++--- > Koha/Schema/Result/Aqbudget.pm | 81 +++++++++----- > Koha/Schema/Result/Aqbudgetperiod.pm | 37 +++++-- > Koha/Schema/Result/Aqinvoice.pm | 27 +---- > Koha/Schema/Result/Aqorder.pm | 68 ++++++------ > Koha/Schema/Result/AuthSubfieldStructure.pm | 9 +- > Koha/Schema/Result/AuthorisedValue.pm | 19 +++- > Koha/Schema/Result/AuthorisedValueCategory.pm | 7 +- > Koha/Schema/Result/Biblio.pm | 29 ++++- > Koha/Schema/Result/Borrower.pm | 51 +++++---- > Koha/Schema/Result/BorrowerAttribute.pm | 12 +- > Koha/Schema/Result/BorrowerAttributeType.pm | 35 +++++- > Koha/Schema/Result/BorrowerModification.pm | 20 +++- > Koha/Schema/Result/Category.pm | 55 +++++++--- > Koha/Schema/Result/City.pm | 16 +-- > Koha/Schema/Result/DefaultCircRule.pm | 8 +- > Koha/Schema/Result/Deletedbiblio.pm | 8 +- > Koha/Schema/Result/Deletedborrower.pm | 49 ++++++--- > Koha/Schema/Result/Deleteditem.pm | 20 +++- > Koha/Schema/Result/EdifactMessage.pm | 31 ++---- > Koha/Schema/Result/Ethnicity.pm | 66 +++++++++++ > Koha/Schema/Result/Housebound.pm | 122 +++++++++++++++++++++ > Koha/Schema/Result/HouseboundInstance.pm | 107 ++++++++++++++++++ > Koha/Schema/Result/Illrequest.pm | 48 ++++++-- > Koha/Schema/Result/ImportBatch.pm | 26 ++--- > Koha/Schema/Result/Issue.pm | 26 ++--- > Koha/Schema/Result/Item.pm | 37 ++----- > Koha/Schema/Result/Letter.pm | 6 +- > .../Result/MarcModificationTemplateAction.pm | 8 +- > Koha/Schema/Result/MessageAttribute.pm | 9 +- > Koha/Schema/Result/NeedMergeAuthority.pm | 20 ++-- > Koha/Schema/Result/OaiSet.pm | 14 ++- > Koha/Schema/Result/OaiSetsBiblio.pm | 22 +++- > Koha/Schema/Result/OaiSetsMapping.pm | 18 +-- > Koha/Schema/Result/OldReserve.pm | 8 +- > Koha/Schema/Result/Patronimage.pm | 12 +- > Koha/Schema/Result/Serialitem.pm | 22 +--- > Koha/Schema/Result/Session.pm | 8 +- > Koha/Schema/Result/Stockrotationrota.pm | 22 +++- > Koha/Schema/Result/Subscription.pm | 39 ++----- > Koha/Schema/Result/Subscriptionroutinglist.pm | 22 +--- > Koha/Schema/Result/Suggestion.pm | 96 ++++++++-------- > Koha/Schema/Result/VendorEdiAccount.pm | 7 +- > 45 files changed, 908 insertions(+), 478 deletions(-) > create mode 100644 Koha/Schema/Result/Ethnicity.pm > create mode 100644 Koha/Schema/Result/Housebound.pm > create mode 100644 Koha/Schema/Result/HouseboundInstance.pm > >diff --git a/Koha/Schema/Result/Aqbasket.pm b/Koha/Schema/Result/Aqbasket.pm >index bb1e5a78aa..154a91dd57 100644 >--- a/Koha/Schema/Result/Aqbasket.pm >+++ b/Koha/Schema/Result/Aqbasket.pm >@@ -223,7 +223,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "RESTRICT", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -309,8 +309,8 @@ Composing rels: L</aqbasketusers> -> borrowernumber > __PACKAGE__->many_to_many("borrowernumbers", "aqbasketusers", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gSw/f4JmMBzEssEFRg2fAQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:j41n7K4Pygo6KvdmRKaggA > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqbasketgroup.pm b/Koha/Schema/Result/Aqbasketgroup.pm >index 618ebd9632..9f1844235b 100644 >--- a/Koha/Schema/Result/Aqbasketgroup.pm >+++ b/Koha/Schema/Result/Aqbasketgroup.pm >@@ -66,7 +66,7 @@ __PACKAGE__->table("aqbasketgroups"); > =head2 billingplace > > data_type: 'varchar' >- is_nullable: 1 >+ is_nullable: 0 > size: 10 > > =cut >@@ -87,7 +87,7 @@ __PACKAGE__->add_columns( > "deliverycomment", > { data_type => "varchar", is_nullable => 1, size => 255 }, > "billingplace", >- { data_type => "varchar", is_nullable => 1, size => 10 }, >+ { data_type => "varchar", is_nullable => 0, size => 10 }, > ); > > =head1 PRIMARY KEY >@@ -135,8 +135,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9cEWAMwcFKPYPEG1CaaD3w >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LE9jdrqhTciPR6UG+PnIXQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqbookseller.pm b/Koha/Schema/Result/Aqbookseller.pm >index 159ade6599..1d0a5ee610 100644 >--- a/Koha/Schema/Result/Aqbookseller.pm >+++ b/Koha/Schema/Result/Aqbookseller.pm >@@ -73,8 +73,7 @@ __PACKAGE__->table("aqbooksellers"); > =head2 currency > > data_type: 'varchar' >- default_value: (empty string) >- is_nullable: 0 >+ is_nullable: 1 > size: 10 > > =head2 booksellerfax >@@ -142,12 +141,6 @@ __PACKAGE__->table("aqbooksellers"); > data_type: 'tinyint' > is_nullable: 1 > >-=head2 tax_rate >- >- data_type: 'decimal' >- is_nullable: 1 >- size: [6,4] >- > =head2 discount > > data_type: 'float' >@@ -160,6 +153,12 @@ __PACKAGE__->table("aqbooksellers"); > is_nullable: 1 > size: 50 > >+=head2 tax_rate >+ >+ data_type: 'decimal' >+ is_nullable: 1 >+ size: [6,4] >+ > =head2 deliverytime > > data_type: 'integer' >@@ -187,7 +186,7 @@ __PACKAGE__->add_columns( > "othersupplier", > { data_type => "longtext", is_nullable => 1 }, > "currency", >- { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, >+ { data_type => "varchar", is_nullable => 1, size => 10 }, > "booksellerfax", > { data_type => "longtext", is_nullable => 1 }, > "notes", >@@ -212,12 +211,12 @@ __PACKAGE__->add_columns( > { data_type => "tinyint", is_nullable => 1 }, > "invoiceincgst", > { data_type => "tinyint", is_nullable => 1 }, >- "tax_rate", >- { data_type => "decimal", is_nullable => 1, size => [6, 4] }, > "discount", > { data_type => "float", is_nullable => 1, size => [6, 4] }, > "fax", > { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "tax_rate", >+ { data_type => "decimal", is_nullable => 1, size => [6, 4] }, > "deliverytime", > { data_type => "integer", is_nullable => 1 }, > ); >@@ -382,8 +381,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DyaF9RbcNAOjPQ1lrxHV3A >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:i1MBNQ/K1Rh4wMZDnFCEzw > > __PACKAGE__->add_columns( > '+active' => { is_boolean => 1 }, >diff --git a/Koha/Schema/Result/Aqbudget.pm b/Koha/Schema/Result/Aqbudget.pm >index 1cdb64c31d..5f0b8c1722 100644 >--- a/Koha/Schema/Result/Aqbudget.pm >+++ b/Koha/Schema/Result/Aqbudget.pm >@@ -23,22 +23,35 @@ __PACKAGE__->table("aqbudgets"); > > =head1 ACCESSORS > >+=head2 budget_code >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 30 >+ >+=head2 budget_amount >+ >+ data_type: 'decimal' >+ default_value: 0.000000 >+ is_nullable: 0 >+ size: [28,6] >+ > =head2 budget_id > > data_type: 'integer' > is_auto_increment: 1 > is_nullable: 0 > >-=head2 budget_parent_id >+=head2 budget_branchcode > >- data_type: 'integer' >+ data_type: 'varchar' > is_nullable: 1 >+ size: 10 > >-=head2 budget_code >+=head2 budget_parent_id > >- data_type: 'varchar' >+ data_type: 'integer' > is_nullable: 1 >- size: 30 > > =head2 budget_name > >@@ -46,19 +59,6 @@ __PACKAGE__->table("aqbudgets"); > is_nullable: 1 > size: 80 > >-=head2 budget_branchcode >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 10 >- >-=head2 budget_amount >- >- data_type: 'decimal' >- default_value: 0.000000 >- is_nullable: 1 >- size: [28,6] >- > =head2 budget_encumb > > data_type: 'decimal' >@@ -88,6 +88,7 @@ __PACKAGE__->table("aqbudgets"); > =head2 budget_period_id > > data_type: 'integer' >+ is_foreign_key: 1 > is_nullable: 1 > > =head2 sort1_authcat >@@ -116,23 +117,23 @@ __PACKAGE__->table("aqbudgets"); > =cut > > __PACKAGE__->add_columns( >- "budget_id", >- { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >- "budget_parent_id", >- { data_type => "integer", is_nullable => 1 }, > "budget_code", > { data_type => "varchar", is_nullable => 1, size => 30 }, >- "budget_name", >- { data_type => "varchar", is_nullable => 1, size => 80 }, >- "budget_branchcode", >- { data_type => "varchar", is_nullable => 1, size => 10 }, > "budget_amount", > { > data_type => "decimal", > default_value => "0.000000", >- is_nullable => 1, >+ is_nullable => 0, > size => [28, 6], > }, >+ "budget_id", >+ { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >+ "budget_branchcode", >+ { data_type => "varchar", is_nullable => 1, size => 10 }, >+ "budget_parent_id", >+ { data_type => "integer", is_nullable => 1 }, >+ "budget_name", >+ { data_type => "varchar", is_nullable => 1, size => 80 }, > "budget_encumb", > { > data_type => "decimal", >@@ -157,7 +158,7 @@ __PACKAGE__->add_columns( > is_nullable => 0, > }, > "budget_period_id", >- { data_type => "integer", is_nullable => 1 }, >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "sort1_authcat", > { data_type => "varchar", is_nullable => 1, size => 80 }, > "sort2_authcat", >@@ -257,6 +258,26 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 budget_period >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::Aqbudgetperiod> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "budget_period", >+ "Koha::Schema::Result::Aqbudgetperiod", >+ { budget_period_id => "budget_period_id" }, >+ { >+ is_deferrable => 1, >+ join_type => "LEFT", >+ on_delete => "CASCADE", >+ on_update => "CASCADE", >+ }, >+); >+ > =head2 suggestions > > Type: has_many >@@ -298,8 +319,8 @@ Composing rels: L</aqbudgetborrowers> -> borrowernumber > __PACKAGE__->many_to_many("borrowernumbers", "aqbudgetborrowers", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-16 13:50:45 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zB7ox8a4KdDGq5fsbQfLGQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oAGvpiU7zjOnpWEfpOMmDw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqbudgetperiod.pm b/Koha/Schema/Result/Aqbudgetperiod.pm >index 1d76ec00d9..881193f8e3 100644 >--- a/Koha/Schema/Result/Aqbudgetperiod.pm >+++ b/Koha/Schema/Result/Aqbudgetperiod.pm >@@ -52,12 +52,6 @@ __PACKAGE__->table("aqbudgetperiods"); > data_type: 'longtext' > is_nullable: 1 > >-=head2 budget_period_total >- >- data_type: 'decimal' >- is_nullable: 1 >- size: [28,6] >- > =head2 budget_period_locked > > data_type: 'tinyint' >@@ -75,6 +69,12 @@ __PACKAGE__->table("aqbudgetperiods"); > is_nullable: 1 > size: 10 > >+=head2 budget_period_total >+ >+ data_type: 'decimal' >+ is_nullable: 1 >+ size: [28,6] >+ > =cut > > __PACKAGE__->add_columns( >@@ -88,14 +88,14 @@ __PACKAGE__->add_columns( > { data_type => "tinyint", default_value => 0, is_nullable => 1 }, > "budget_period_description", > { data_type => "longtext", is_nullable => 1 }, >- "budget_period_total", >- { data_type => "decimal", is_nullable => 1, size => [28, 6] }, > "budget_period_locked", > { data_type => "tinyint", is_nullable => 1 }, > "sort1_authcat", > { data_type => "varchar", is_nullable => 1, size => 10 }, > "sort2_authcat", > { data_type => "varchar", is_nullable => 1, size => 10 }, >+ "budget_period_total", >+ { data_type => "decimal", is_nullable => 1, size => [28, 6] }, > ); > > =head1 PRIMARY KEY >@@ -110,9 +110,26 @@ __PACKAGE__->add_columns( > > __PACKAGE__->set_primary_key("budget_period_id"); > >+=head1 RELATIONS >+ >+=head2 aqbudgets >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::Aqbudget> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "aqbudgets", >+ "Koha::Schema::Result::Aqbudget", >+ { "foreign.budget_period_id" => "self.budget_period_id" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:M13qdhmXgKilais2IFkXFw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:V7R0Zdn1ZrQoRIcib6LUIw > > > # 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 b760947123..9a91a36d3f 100644 >--- a/Koha/Schema/Result/Aqinvoice.pm >+++ b/Koha/Schema/Result/Aqinvoice.pm >@@ -73,7 +73,6 @@ __PACKAGE__->table("aqinvoices"); > =head2 message_id > > data_type: 'integer' >- is_foreign_key: 1 > is_nullable: 1 > > =cut >@@ -96,7 +95,7 @@ __PACKAGE__->add_columns( > "shipmentcost_budgetid", > { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "message_id", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, >+ { data_type => "integer", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -158,26 +157,6 @@ __PACKAGE__->belongs_to( > { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, > ); > >-=head2 message >- >-Type: belongs_to >- >-Related object: L<Koha::Schema::Result::EdifactMessage> >- >-=cut >- >-__PACKAGE__->belongs_to( >- "message", >- "Koha::Schema::Result::EdifactMessage", >- { id => "message_id" }, >- { >- is_deferrable => 1, >- join_type => "LEFT", >- on_delete => "SET NULL", >- on_update => "RESTRICT", >- }, >-); >- > =head2 shipmentcost_budgetid > > Type: belongs_to >@@ -199,8 +178,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-16 13:50:45 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mpdxTbkz/8WInG5Wp4q7Ug >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Vt50GepELpI7iE49C9dTJA > > > # 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 803511822d..050182509e 100644 >--- a/Koha/Schema/Result/Aqorder.pm >+++ b/Koha/Schema/Result/Aqorder.pm >@@ -152,12 +152,6 @@ __PACKAGE__->table("aqorders"); > is_nullable: 1 > size: [13,2] > >-=head2 replacementprice >- >- data_type: 'decimal' >- is_nullable: 1 >- size: [28,6] >- > =head2 rrp_tax_excluded > > data_type: 'decimal' >@@ -230,12 +224,6 @@ __PACKAGE__->table("aqorders"); > is_nullable: 1 > size: [6,4] > >-=head2 budget_id >- >- data_type: 'integer' >- is_foreign_key: 1 >- is_nullable: 0 >- > =head2 budgetdate > > data_type: 'date' >@@ -254,6 +242,17 @@ __PACKAGE__->table("aqorders"); > is_nullable: 1 > size: 80 > >+=head2 uncertainprice >+ >+ data_type: 'tinyint' >+ is_nullable: 1 >+ >+=head2 budget_id >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 0 >+ > =head2 sort1_authcat > > data_type: 'varchar' >@@ -266,11 +265,6 @@ __PACKAGE__->table("aqorders"); > is_nullable: 1 > size: 10 > >-=head2 uncertainprice >- >- data_type: 'tinyint' >- is_nullable: 1 >- > =head2 claims_count > > data_type: 'integer' >@@ -283,12 +277,6 @@ __PACKAGE__->table("aqorders"); > datetime_undef_if_invalid: 1 > is_nullable: 1 > >-=head2 subscriptionid >- >- data_type: 'integer' >- is_foreign_key: 1 >- is_nullable: 1 >- > =head2 parent_ordernumber > > data_type: 'integer' >@@ -301,6 +289,12 @@ __PACKAGE__->table("aqorders"); > is_nullable: 1 > size: 16 > >+=head2 subscriptionid >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 1 >+ > =head2 line_item_id > > data_type: 'varchar' >@@ -324,6 +318,12 @@ __PACKAGE__->table("aqorders"); > data_type: 'mediumtext' > is_nullable: 1 > >+=head2 replacementprice >+ >+ data_type: 'decimal' >+ is_nullable: 1 >+ size: [28,6] >+ > =cut > > __PACKAGE__->add_columns( >@@ -376,8 +376,6 @@ __PACKAGE__->add_columns( > }, > "rrp", > { data_type => "decimal", is_nullable => 1, size => [13, 2] }, >- "replacementprice", >- { data_type => "decimal", is_nullable => 1, size => [28, 6] }, > "rrp_tax_excluded", > { data_type => "decimal", is_nullable => 1, size => [28, 6] }, > "rrp_tax_included", >@@ -402,26 +400,24 @@ __PACKAGE__->add_columns( > { data_type => "decimal", is_nullable => 1, size => [28, 6] }, > "discount", > { data_type => "float", is_nullable => 1, size => [6, 4] }, >- "budget_id", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > "budgetdate", > { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, > "sort1", > { data_type => "varchar", is_nullable => 1, size => 80 }, > "sort2", > { data_type => "varchar", is_nullable => 1, size => 80 }, >+ "uncertainprice", >+ { data_type => "tinyint", is_nullable => 1 }, >+ "budget_id", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > "sort1_authcat", > { data_type => "varchar", is_nullable => 1, size => 10 }, > "sort2_authcat", > { data_type => "varchar", is_nullable => 1, size => 10 }, >- "uncertainprice", >- { data_type => "tinyint", is_nullable => 1 }, > "claims_count", > { data_type => "integer", default_value => 0, is_nullable => 1 }, > "claimed_date", > { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, >- "subscriptionid", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "parent_ordernumber", > { data_type => "integer", is_nullable => 1 }, > "orderstatus", >@@ -431,6 +427,8 @@ __PACKAGE__->add_columns( > is_nullable => 1, > size => 16, > }, >+ "subscriptionid", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "line_item_id", > { data_type => "varchar", is_nullable => 1, size => 35 }, > "suppliers_reference_number", >@@ -439,6 +437,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 3 }, > "suppliers_report", > { data_type => "mediumtext", is_nullable => 1 }, >+ "replacementprice", >+ { data_type => "decimal", is_nullable => 1, size => [28, 6] }, > ); > > =head1 PRIMARY KEY >@@ -551,7 +551,7 @@ __PACKAGE__->belongs_to( > is_deferrable => 1, > join_type => "LEFT", > on_delete => "SET NULL", >- on_update => "CASCADE", >+ on_update => "SET NULL", > }, > ); > >@@ -661,8 +661,8 @@ Composing rels: L</aqorder_users> -> borrowernumber > __PACKAGE__->many_to_many("borrowernumbers", "aqorder_users", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-08-31 11:51:37 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GQEXetlivZm7buQohl8m4A >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:y7OfxpCVrDFw2JQU4SErew > > sub koha_objects_class { > 'Koha::Acquisition::Orders'; >diff --git a/Koha/Schema/Result/AuthSubfieldStructure.pm b/Koha/Schema/Result/AuthSubfieldStructure.pm >index 06bc0c9db2..3da88e154d 100644 >--- a/Koha/Schema/Result/AuthSubfieldStructure.pm >+++ b/Koha/Schema/Result/AuthSubfieldStructure.pm >@@ -121,8 +121,7 @@ __PACKAGE__->table("auth_subfield_structure"); > =head2 frameworkcode > > data_type: 'varchar' >- default_value: (empty string) >- is_nullable: 0 >+ is_nullable: 1 > size: 10 > > =head2 defaultvalue >@@ -170,7 +169,7 @@ __PACKAGE__->add_columns( > "kohafield", > { data_type => "varchar", default_value => "", is_nullable => 1, size => 45 }, > "frameworkcode", >- { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, >+ { data_type => "varchar", is_nullable => 1, size => 10 }, > "defaultvalue", > { data_type => "mediumtext", is_nullable => 1 }, > ); >@@ -209,8 +208,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5Prv/DCQk32mTQaqtYhUuA >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:htwTatj58OlWarcF1/9pSA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/AuthorisedValue.pm b/Koha/Schema/Result/AuthorisedValue.pm >index 7b978eb3b8..63d22ae41e 100644 >--- a/Koha/Schema/Result/AuthorisedValue.pm >+++ b/Koha/Schema/Result/AuthorisedValue.pm >@@ -129,9 +129,24 @@ __PACKAGE__->belongs_to( > { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, > ); > >+=head2 illrequests > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-04-26 16:13:07 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YwvGOd/jzk71ekWfO56xrw >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::Illrequest> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "illrequests", >+ "Koha::Schema::Result::Illrequest", >+ { "foreign.status_alias" => "self.id" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:RKwmasD8ufV5zuXcklRE3A > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/AuthorisedValueCategory.pm b/Koha/Schema/Result/AuthorisedValueCategory.pm >index 7778ec25dc..dcc28786f8 100644 >--- a/Koha/Schema/Result/AuthorisedValueCategory.pm >+++ b/Koha/Schema/Result/AuthorisedValueCategory.pm >@@ -26,7 +26,6 @@ __PACKAGE__->table("authorised_value_categories"); > =head2 category_name > > data_type: 'varchar' >- default_value: (empty string) > is_nullable: 0 > size: 32 > >@@ -34,7 +33,7 @@ __PACKAGE__->table("authorised_value_categories"); > > __PACKAGE__->add_columns( > "category_name", >- { data_type => "varchar", default_value => "", is_nullable => 0, size => 32 }, >+ { data_type => "varchar", is_nullable => 0, size => 32 }, > ); > > =head1 PRIMARY KEY >@@ -97,8 +96,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07045 @ 2016-08-30 11:59:31 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6vToj9pUcIv8Jio38rNE4g >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mEZUVKQXHKTLVfXoeMHosw > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Biblio.pm b/Koha/Schema/Result/Biblio.pm >index b118011f27..24394028bb 100644 >--- a/Koha/Schema/Result/Biblio.pm >+++ b/Koha/Schema/Result/Biblio.pm >@@ -242,6 +242,21 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 oai_sets_biblios >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::OaiSetsBiblio> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "oai_sets_biblios", >+ "Koha::Schema::Result::OaiSetsBiblio", >+ { "foreign.biblionumber" => "self.biblionumber" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 old_reserves > > Type: has_many >@@ -347,8 +362,18 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 sets >+ >+Type: many_to_many >+ >+Composing rels: L</oai_sets_biblios> -> set >+ >+=cut >+ >+__PACKAGE__->many_to_many("sets", "oai_sets_biblios", "set"); >+ > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bUv00JjY09Hj2Zj4klqyxA >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:blPsfdnQ/MXZMBtIhnjKJg > > 1; >diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm >index 8e4580f7e0..d13d16936b 100644 >--- a/Koha/Schema/Result/Borrower.pm >+++ b/Koha/Schema/Result/Borrower.pm >@@ -89,7 +89,7 @@ __PACKAGE__->table("borrowers"); > > =head2 state > >- data_type: 'mediumtext' >+ data_type: 'longtext' > is_nullable: 1 > > =head2 zipcode >@@ -170,7 +170,7 @@ __PACKAGE__->table("borrowers"); > =head2 B_state > > accessor: 'b_state' >- data_type: 'mediumtext' >+ data_type: 'longtext' > is_nullable: 1 > > =head2 B_zipcode >@@ -291,6 +291,18 @@ __PACKAGE__->table("borrowers"); > is_nullable: 1 > size: 100 > >+=head2 ethnicity >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 50 >+ >+=head2 ethnotes >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ > =head2 sex > > data_type: 'varchar' >@@ -369,7 +381,7 @@ __PACKAGE__->table("borrowers"); > > =head2 altcontactstate > >- data_type: 'mediumtext' >+ data_type: 'longtext' > is_nullable: 1 > > =head2 altcontactzipcode >@@ -425,7 +437,7 @@ __PACKAGE__->table("borrowers"); > data_type: 'timestamp' > datetime_undef_if_invalid: 1 > default_value: current_timestamp >- is_nullable: 0 >+ is_nullable: 1 > > =head2 lastseen > >@@ -443,7 +455,6 @@ __PACKAGE__->table("borrowers"); > =head2 login_attempts > > data_type: 'integer' >- default_value: 0 > is_nullable: 1 > > =head2 overdrive_auth_token >@@ -479,7 +490,7 @@ __PACKAGE__->add_columns( > "city", > { data_type => "longtext", is_nullable => 1 }, > "state", >- { data_type => "mediumtext", is_nullable => 1 }, >+ { data_type => "longtext", is_nullable => 1 }, > "zipcode", > { data_type => "varchar", is_nullable => 1, size => 25 }, > "country", >@@ -522,7 +533,7 @@ __PACKAGE__->add_columns( > "B_city", > { accessor => "b_city", data_type => "longtext", is_nullable => 1 }, > "B_state", >- { accessor => "b_state", data_type => "mediumtext", is_nullable => 1 }, >+ { accessor => "b_state", data_type => "longtext", is_nullable => 1 }, > "B_zipcode", > { > accessor => "b_zipcode", >@@ -580,6 +591,10 @@ __PACKAGE__->add_columns( > { data_type => "longtext", is_nullable => 1 }, > "relationship", > { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "ethnicity", >+ { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "ethnotes", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, > "sex", > { data_type => "varchar", is_nullable => 1, size => 1 }, > "password", >@@ -607,7 +622,7 @@ __PACKAGE__->add_columns( > "altcontactaddress3", > { data_type => "varchar", is_nullable => 1, size => 255 }, > "altcontactstate", >- { data_type => "mediumtext", is_nullable => 1 }, >+ { data_type => "longtext", is_nullable => 1 }, > "altcontactzipcode", > { data_type => "varchar", is_nullable => 1, size => 50 }, > "altcontactcountry", >@@ -634,7 +649,7 @@ __PACKAGE__->add_columns( > data_type => "timestamp", > datetime_undef_if_invalid => 1, > default_value => \"current_timestamp", >- is_nullable => 0, >+ is_nullable => 1, > }, > "lastseen", > { >@@ -650,7 +665,7 @@ __PACKAGE__->add_columns( > size => 25, > }, > "login_attempts", >- { data_type => "integer", default_value => 0, is_nullable => 1 }, >+ { data_type => "integer", is_nullable => 1 }, > "overdrive_auth_token", > { data_type => "mediumtext", is_nullable => 1 }, > ); >@@ -681,18 +696,6 @@ __PACKAGE__->set_primary_key("borrowernumber"); > > __PACKAGE__->add_unique_constraint("cardnumber", ["cardnumber"]); > >-=head2 C<userid> >- >-=over 4 >- >-=item * L</userid> >- >-=back >- >-=cut >- >-__PACKAGE__->add_unique_constraint("userid", ["userid"]); >- > =head1 RELATIONS > > =head2 accountlines >@@ -1431,8 +1434,8 @@ Composing rels: L</aqorder_users> -> ordernumber > __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-27 13:16:48 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:c3Tb59Kku0Hh+tsVV5eCDg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kjQnCBqkdXvkJl4NeA+rgQ > > __PACKAGE__->belongs_to( > "guarantor", >diff --git a/Koha/Schema/Result/BorrowerAttribute.pm b/Koha/Schema/Result/BorrowerAttribute.pm >index 45ce0bfbbc..816d868bce 100644 >--- a/Koha/Schema/Result/BorrowerAttribute.pm >+++ b/Koha/Schema/Result/BorrowerAttribute.pm >@@ -48,6 +48,12 @@ __PACKAGE__->table("borrower_attributes"); > is_nullable: 1 > size: 255 > >+=head2 password >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 64 >+ > =cut > > __PACKAGE__->add_columns( >@@ -59,6 +65,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 }, > "attribute", > { data_type => "varchar", is_nullable => 1, size => 255 }, >+ "password", >+ { data_type => "varchar", is_nullable => 1, size => 64 }, > ); > > =head1 PRIMARY KEY >@@ -106,8 +114,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-12-08 04:41:27 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EarETnedFsmRmAAJAUrKGg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0mr7/SGK5wcxA3/hNok5Gg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/BorrowerAttributeType.pm b/Koha/Schema/Result/BorrowerAttributeType.pm >index 7c4b7794d4..b5d54e8c4a 100644 >--- a/Koha/Schema/Result/BorrowerAttributeType.pm >+++ b/Koha/Schema/Result/BorrowerAttributeType.pm >@@ -59,6 +59,12 @@ __PACKAGE__->table("borrower_attribute_types"); > default_value: 0 > is_nullable: 0 > >+=head2 password_allowed >+ >+ data_type: 'tinyint' >+ default_value: 0 >+ is_nullable: 0 >+ > =head2 staff_searchable > > data_type: 'tinyint' >@@ -80,6 +86,7 @@ __PACKAGE__->table("borrower_attribute_types"); > =head2 category_code > > data_type: 'varchar' >+ is_foreign_key: 1 > is_nullable: 1 > size: 10 > >@@ -105,6 +112,8 @@ __PACKAGE__->add_columns( > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "opac_editable", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, >+ "password_allowed", >+ { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "staff_searchable", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "authorised_value_category", >@@ -112,7 +121,7 @@ __PACKAGE__->add_columns( > "display_checkout", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "category_code", >- { data_type => "varchar", is_nullable => 1, size => 10 }, >+ { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 }, > "class", > { data_type => "varchar", default_value => "", is_nullable => 0, size => 255 }, > ); >@@ -161,9 +170,29 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 category_code >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::Category> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "category_code", >+ "Koha::Schema::Result::Category", >+ { categorycode => "category_code" }, >+ { >+ is_deferrable => 1, >+ join_type => "LEFT", >+ on_delete => "RESTRICT", >+ on_update => "RESTRICT", >+ }, >+); >+ > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-10-25 20:32:12 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gsPR8PuUUZHFUkr3MIbTpw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:c2Iz8s/2wOnRUAeMdx8Dag > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm >index c91c58e712..d98bd99dab 100644 >--- a/Koha/Schema/Result/BorrowerModification.pm >+++ b/Koha/Schema/Result/BorrowerModification.pm >@@ -301,6 +301,18 @@ __PACKAGE__->table("borrower_modifications"); > is_nullable: 1 > size: 100 > >+=head2 ethnicity >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 50 >+ >+=head2 ethnotes >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ > =head2 sex > > data_type: 'varchar' >@@ -547,6 +559,10 @@ __PACKAGE__->add_columns( > { data_type => "longtext", is_nullable => 1 }, > "relationship", > { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "ethnicity", >+ { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "ethnotes", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, > "sex", > { data_type => "varchar", is_nullable => 1, size => 1 }, > "password", >@@ -610,8 +626,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("verification_token", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-20 13:00:20 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qQ0BWngri+79YvK9S8zZPg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ejtbPFBzRooWpYI6cFZoHg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Category.pm b/Koha/Schema/Result/Category.pm >index 1b61c33957..8ce86e95b9 100644 >--- a/Koha/Schema/Result/Category.pm >+++ b/Koha/Schema/Result/Category.pm >@@ -95,6 +95,12 @@ __PACKAGE__->table("categories"); > default_value: 0 > is_nullable: 0 > >+=head2 illlimit >+ >+ data_type: 'smallint' >+ default_value: 0 >+ is_nullable: 1 >+ > =head2 category_type > > data_type: 'varchar' >@@ -102,13 +108,6 @@ __PACKAGE__->table("categories"); > is_nullable: 0 > size: 1 > >-=head2 BlockExpiredPatronOpacActions >- >- accessor: 'block_expired_patron_opac_actions' >- data_type: 'tinyint' >- default_value: -1 >- is_nullable: 0 >- > =head2 default_privacy > > data_type: 'enum' >@@ -123,6 +122,13 @@ __PACKAGE__->table("categories"); > is_nullable: 0 > size: 7 > >+=head2 BlockExpiredPatronOpacActions >+ >+ accessor: 'block_expired_patron_opac_actions' >+ data_type: 'tinyint' >+ default_value: -1 >+ is_nullable: 0 >+ > =cut > > __PACKAGE__->add_columns( >@@ -152,15 +158,10 @@ __PACKAGE__->add_columns( > { data_type => "decimal", is_nullable => 1, size => [28, 6] }, > "hidelostitems", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, >+ "illlimit", >+ { data_type => "smallint", default_value => 0, is_nullable => 1 }, > "category_type", > { data_type => "varchar", default_value => "A", is_nullable => 0, size => 1 }, >- "BlockExpiredPatronOpacActions", >- { >- accessor => "block_expired_patron_opac_actions", >- data_type => "tinyint", >- default_value => -1, >- is_nullable => 0, >- }, > "default_privacy", > { > data_type => "enum", >@@ -175,6 +176,13 @@ __PACKAGE__->add_columns( > is_nullable => 0, > size => 7, > }, >+ "BlockExpiredPatronOpacActions", >+ { >+ accessor => "block_expired_patron_opac_actions", >+ data_type => "tinyint", >+ default_value => -1, >+ is_nullable => 0, >+ }, > ); > > =head1 PRIMARY KEY >@@ -191,6 +199,21 @@ __PACKAGE__->set_primary_key("categorycode"); > > =head1 RELATIONS > >+=head2 borrower_attribute_types >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::BorrowerAttributeType> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "borrower_attribute_types", >+ "Koha::Schema::Result::BorrowerAttributeType", >+ { "foreign.category_code" => "self.categorycode" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 borrower_message_preferences > > Type: has_many >@@ -282,8 +305,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-05 14:29:17 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yvHcgnSv1RXNMXJixVtt0Q >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:L6F4lG7nQiXzCz5Eee0mtw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/City.pm b/Koha/Schema/Result/City.pm >index 9f9ce6bf81..68fbd61fef 100644 >--- a/Koha/Schema/Result/City.pm >+++ b/Koha/Schema/Result/City.pm >@@ -42,17 +42,17 @@ __PACKAGE__->table("cities"); > is_nullable: 1 > size: 100 > >-=head2 city_country >+=head2 city_zipcode > > data_type: 'varchar' > is_nullable: 1 >- size: 100 >+ size: 20 > >-=head2 city_zipcode >+=head2 city_country > > data_type: 'varchar' > is_nullable: 1 >- size: 20 >+ size: 100 > > =cut > >@@ -63,10 +63,10 @@ __PACKAGE__->add_columns( > { data_type => "varchar", default_value => "", is_nullable => 0, size => 100 }, > "city_state", > { data_type => "varchar", is_nullable => 1, size => 100 }, >- "city_country", >- { data_type => "varchar", is_nullable => 1, size => 100 }, > "city_zipcode", > { data_type => "varchar", is_nullable => 1, size => 20 }, >+ "city_country", >+ { data_type => "varchar", is_nullable => 1, size => 100 }, > ); > > =head1 PRIMARY KEY >@@ -82,8 +82,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("cityid"); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zEjfS65sp13yF7dH8/ojZQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aOIpsiZF15Qzurb4NNUZZQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/DefaultCircRule.pm b/Koha/Schema/Result/DefaultCircRule.pm >index 355f4ea385..2b08183705 100644 >--- a/Koha/Schema/Result/DefaultCircRule.pm >+++ b/Koha/Schema/Result/DefaultCircRule.pm >@@ -42,7 +42,7 @@ __PACKAGE__->table("default_circ_rules"); > > =head2 holdallowed > >- data_type: 'integer' >+ data_type: 'tinyint' > is_nullable: 1 > > =head2 hold_fulfillment_policy >@@ -73,7 +73,7 @@ __PACKAGE__->add_columns( > "maxonsiteissueqty", > { data_type => "integer", is_nullable => 1 }, > "holdallowed", >- { data_type => "integer", is_nullable => 1 }, >+ { data_type => "tinyint", is_nullable => 1 }, > "hold_fulfillment_policy", > { > data_type => "enum", >@@ -98,8 +98,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("singleton"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-04-29 10:32:00 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fqBrj0c9h9c0eBlC0kG51w >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ttOioXaCXJKF52QQcOUlOQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Deletedbiblio.pm b/Koha/Schema/Result/Deletedbiblio.pm >index f809b9324d..8477b6269e 100644 >--- a/Koha/Schema/Result/Deletedbiblio.pm >+++ b/Koha/Schema/Result/Deletedbiblio.pm >@@ -26,7 +26,7 @@ __PACKAGE__->table("deletedbiblio"); > =head2 biblionumber > > data_type: 'integer' >- is_auto_increment: 1 >+ default_value: 0 > is_nullable: 0 > > =head2 frameworkcode >@@ -93,7 +93,7 @@ __PACKAGE__->table("deletedbiblio"); > > __PACKAGE__->add_columns( > "biblionumber", >- { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >+ { data_type => "integer", default_value => 0, is_nullable => 0 }, > "frameworkcode", > { data_type => "varchar", default_value => "", is_nullable => 0, size => 4 }, > "author", >@@ -153,8 +153,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dP0HOIp/+I93Y/u92TDI1g >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xbFngDcDw22QzSI9NgqvtQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Deletedborrower.pm b/Koha/Schema/Result/Deletedborrower.pm >index 4d15e35c1f..e57fdb3649 100644 >--- a/Koha/Schema/Result/Deletedborrower.pm >+++ b/Koha/Schema/Result/Deletedborrower.pm >@@ -89,7 +89,7 @@ __PACKAGE__->table("deletedborrowers"); > > =head2 state > >- data_type: 'mediumtext' >+ data_type: 'longtext' > is_nullable: 1 > > =head2 zipcode >@@ -170,7 +170,7 @@ __PACKAGE__->table("deletedborrowers"); > =head2 B_state > > accessor: 'b_state' >- data_type: 'mediumtext' >+ data_type: 'longtext' > is_nullable: 1 > > =head2 B_zipcode >@@ -214,8 +214,7 @@ __PACKAGE__->table("deletedborrowers"); > =head2 categorycode > > data_type: 'varchar' >- default_value: (empty string) >- is_nullable: 0 >+ is_nullable: 1 > size: 10 > > =head2 dateenrolled >@@ -289,6 +288,18 @@ __PACKAGE__->table("deletedborrowers"); > is_nullable: 1 > size: 100 > >+=head2 ethnicity >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 50 >+ >+=head2 ethnotes >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ > =head2 sex > > data_type: 'varchar' >@@ -367,7 +378,7 @@ __PACKAGE__->table("deletedborrowers"); > > =head2 altcontactstate > >- data_type: 'mediumtext' >+ data_type: 'longtext' > is_nullable: 1 > > =head2 altcontactzipcode >@@ -401,8 +412,7 @@ __PACKAGE__->table("deletedborrowers"); > =head2 privacy > > data_type: 'integer' >- default_value: 1 >- is_nullable: 0 >+ is_nullable: 1 > > =head2 privacy_guarantor_checkouts > >@@ -422,7 +432,7 @@ __PACKAGE__->table("deletedborrowers"); > data_type: 'timestamp' > datetime_undef_if_invalid: 1 > default_value: current_timestamp >- is_nullable: 0 >+ is_nullable: 1 > > =head2 lastseen > >@@ -440,7 +450,6 @@ __PACKAGE__->table("deletedborrowers"); > =head2 login_attempts > > data_type: 'integer' >- default_value: 0 > is_nullable: 1 > > =head2 overdrive_auth_token >@@ -476,7 +485,7 @@ __PACKAGE__->add_columns( > "city", > { data_type => "longtext", is_nullable => 1 }, > "state", >- { data_type => "mediumtext", is_nullable => 1 }, >+ { data_type => "longtext", is_nullable => 1 }, > "zipcode", > { data_type => "varchar", is_nullable => 1, size => 25 }, > "country", >@@ -519,7 +528,7 @@ __PACKAGE__->add_columns( > "B_city", > { accessor => "b_city", data_type => "longtext", is_nullable => 1 }, > "B_state", >- { accessor => "b_state", data_type => "mediumtext", is_nullable => 1 }, >+ { accessor => "b_state", data_type => "longtext", is_nullable => 1 }, > "B_zipcode", > { > accessor => "b_zipcode", >@@ -538,7 +547,7 @@ __PACKAGE__->add_columns( > "branchcode", > { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, > "categorycode", >- { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, >+ { data_type => "varchar", is_nullable => 1, size => 10 }, > "dateenrolled", > { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, > "dateexpiry", >@@ -565,6 +574,10 @@ __PACKAGE__->add_columns( > { data_type => "longtext", is_nullable => 1 }, > "relationship", > { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "ethnicity", >+ { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "ethnotes", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, > "sex", > { data_type => "varchar", is_nullable => 1, size => 1 }, > "password", >@@ -592,7 +605,7 @@ __PACKAGE__->add_columns( > "altcontactaddress3", > { data_type => "varchar", is_nullable => 1, size => 255 }, > "altcontactstate", >- { data_type => "mediumtext", is_nullable => 1 }, >+ { data_type => "longtext", is_nullable => 1 }, > "altcontactzipcode", > { data_type => "varchar", is_nullable => 1, size => 50 }, > "altcontactcountry", >@@ -604,7 +617,7 @@ __PACKAGE__->add_columns( > "sms_provider_id", > { data_type => "integer", is_nullable => 1 }, > "privacy", >- { data_type => "integer", default_value => 1, is_nullable => 0 }, >+ { data_type => "integer", is_nullable => 1 }, > "privacy_guarantor_checkouts", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "checkprevcheckout", >@@ -619,7 +632,7 @@ __PACKAGE__->add_columns( > data_type => "timestamp", > datetime_undef_if_invalid => 1, > default_value => \"current_timestamp", >- is_nullable => 0, >+ is_nullable => 1, > }, > "lastseen", > { >@@ -635,14 +648,14 @@ __PACKAGE__->add_columns( > size => 25, > }, > "login_attempts", >- { data_type => "integer", default_value => 0, is_nullable => 1 }, >+ { data_type => "integer", is_nullable => 1 }, > "overdrive_auth_token", > { data_type => "mediumtext", is_nullable => 1 }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DNkNHNcv0lkMH6/seu89hg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BEq3IZzmy8La8NnwPCbV1Q > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Deleteditem.pm b/Koha/Schema/Result/Deleteditem.pm >index 33f1935a4b..e07a18e17d 100644 >--- a/Koha/Schema/Result/Deleteditem.pm >+++ b/Koha/Schema/Result/Deleteditem.pm >@@ -276,6 +276,8 @@ __PACKAGE__->table("deleteditems"); > is_nullable: 1 > size: 32 > >+stores the inventory number of deleted items >+ > =head2 new_status > > data_type: 'varchar' >@@ -406,9 +408,23 @@ __PACKAGE__->add_columns( > > __PACKAGE__->set_primary_key("itemnumber"); > >+=head1 UNIQUE CONSTRAINTS >+ >+=head2 C<deleteditemsstocknumberidx> >+ >+=over 4 >+ >+=item * L</stocknumber> >+ >+=back >+ >+=cut >+ >+__PACKAGE__->add_unique_constraint("deleteditemsstocknumberidx", ["stocknumber"]); >+ > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-26 16:15:09 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:L7G0HG5gvgyhfpKb7LcUFw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lvAfwRdG2uylRDO5dxJEdQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/EdifactMessage.pm b/Koha/Schema/Result/EdifactMessage.pm >index 7e0c4feff2..cd12bacbbc 100644 >--- a/Koha/Schema/Result/EdifactMessage.pm >+++ b/Koha/Schema/Result/EdifactMessage.pm >@@ -119,21 +119,6 @@ __PACKAGE__->set_primary_key("id"); > > =head1 RELATIONS > >-=head2 aqinvoices >- >-Type: has_many >- >-Related object: L<Koha::Schema::Result::Aqinvoice> >- >-=cut >- >-__PACKAGE__->has_many( >- "aqinvoices", >- "Koha::Schema::Result::Aqinvoice", >- { "foreign.message_id" => "self.id" }, >- { cascade_copy => 0, cascade_delete => 0 }, >-); >- > =head2 basketno > > Type: belongs_to >@@ -149,8 +134,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "RESTRICT", >+ on_update => "RESTRICT", > }, > ); > >@@ -169,8 +154,8 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "RESTRICT", >+ on_update => "RESTRICT", > }, > ); > >@@ -189,14 +174,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >- on_update => "CASCADE", >+ on_delete => "RESTRICT", >+ on_update => "RESTRICT", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JHUEsQ+kXjGTRxxc2FFSjQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:f90XogVNxT1OZtN5s02KAQ > > > 1; >diff --git a/Koha/Schema/Result/Ethnicity.pm b/Koha/Schema/Result/Ethnicity.pm >new file mode 100644 >index 0000000000..b2775a94e0 >--- /dev/null >+++ b/Koha/Schema/Result/Ethnicity.pm >@@ -0,0 +1,66 @@ >+use utf8; >+package Koha::Schema::Result::Ethnicity; >+ >+# Created by DBIx::Class::Schema::Loader >+# DO NOT MODIFY THE FIRST PART OF THIS FILE >+ >+=head1 NAME >+ >+Koha::Schema::Result::Ethnicity >+ >+=cut >+ >+use strict; >+use warnings; >+ >+use base 'DBIx::Class::Core'; >+ >+=head1 TABLE: C<ethnicity> >+ >+=cut >+ >+__PACKAGE__->table("ethnicity"); >+ >+=head1 ACCESSORS >+ >+=head2 code >+ >+ data_type: 'varchar' >+ default_value: (empty string) >+ is_nullable: 0 >+ size: 10 >+ >+=head2 name >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ >+=cut >+ >+__PACKAGE__->add_columns( >+ "code", >+ { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, >+ "name", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, >+); >+ >+=head1 PRIMARY KEY >+ >+=over 4 >+ >+=item * L</code> >+ >+=back >+ >+=cut >+ >+__PACKAGE__->set_primary_key("code"); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Qu8cssBwlX7MIpoFZ6Xvlg >+ >+ >+# You can replace this text with custom code or comments, and it will be preserved on regeneration >+1; >diff --git a/Koha/Schema/Result/Housebound.pm b/Koha/Schema/Result/Housebound.pm >new file mode 100644 >index 0000000000..de97516bd6 >--- /dev/null >+++ b/Koha/Schema/Result/Housebound.pm >@@ -0,0 +1,122 @@ >+use utf8; >+package Koha::Schema::Result::Housebound; >+ >+# Created by DBIx::Class::Schema::Loader >+# DO NOT MODIFY THE FIRST PART OF THIS FILE >+ >+=head1 NAME >+ >+Koha::Schema::Result::Housebound >+ >+=cut >+ >+use strict; >+use warnings; >+ >+use base 'DBIx::Class::Core'; >+ >+=head1 TABLE: C<housebound> >+ >+=cut >+ >+__PACKAGE__->table("housebound"); >+ >+=head1 ACCESSORS >+ >+=head2 hbnumber >+ >+ data_type: 'integer' >+ is_auto_increment: 1 >+ is_nullable: 0 >+ >+=head2 day >+ >+ data_type: 'mediumtext' >+ is_nullable: 0 >+ >+=head2 frequency >+ >+ data_type: 'mediumtext' >+ is_nullable: 1 >+ >+=head2 borrowernumber >+ >+ data_type: 'integer' >+ is_nullable: 1 >+ >+=head2 Itype_quant >+ >+ accessor: 'itype_quant' >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 10 >+ >+=head2 Item_subject >+ >+ accessor: 'item_subject' >+ data_type: 'mediumtext' >+ is_nullable: 1 >+ >+=head2 Item_authors >+ >+ accessor: 'item_authors' >+ data_type: 'mediumtext' >+ is_nullable: 1 >+ >+=head2 referral >+ >+ data_type: 'mediumtext' >+ is_nullable: 1 >+ >+=head2 notes >+ >+ data_type: 'mediumtext' >+ is_nullable: 1 >+ >+=cut >+ >+__PACKAGE__->add_columns( >+ "hbnumber", >+ { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >+ "day", >+ { data_type => "mediumtext", is_nullable => 0 }, >+ "frequency", >+ { data_type => "mediumtext", is_nullable => 1 }, >+ "borrowernumber", >+ { data_type => "integer", is_nullable => 1 }, >+ "Itype_quant", >+ { >+ accessor => "itype_quant", >+ data_type => "varchar", >+ is_nullable => 1, >+ size => 10, >+ }, >+ "Item_subject", >+ { accessor => "item_subject", data_type => "mediumtext", is_nullable => 1 }, >+ "Item_authors", >+ { accessor => "item_authors", data_type => "mediumtext", is_nullable => 1 }, >+ "referral", >+ { data_type => "mediumtext", is_nullable => 1 }, >+ "notes", >+ { data_type => "mediumtext", is_nullable => 1 }, >+); >+ >+=head1 PRIMARY KEY >+ >+=over 4 >+ >+=item * L</hbnumber> >+ >+=back >+ >+=cut >+ >+__PACKAGE__->set_primary_key("hbnumber"); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KfWOT6B9V4lGTxfWOE+QTQ >+ >+ >+# You can replace this text with custom code or comments, and it will be preserved on regeneration >+1; >diff --git a/Koha/Schema/Result/HouseboundInstance.pm b/Koha/Schema/Result/HouseboundInstance.pm >new file mode 100644 >index 0000000000..8c285924d9 >--- /dev/null >+++ b/Koha/Schema/Result/HouseboundInstance.pm >@@ -0,0 +1,107 @@ >+use utf8; >+package Koha::Schema::Result::HouseboundInstance; >+ >+# Created by DBIx::Class::Schema::Loader >+# DO NOT MODIFY THE FIRST PART OF THIS FILE >+ >+=head1 NAME >+ >+Koha::Schema::Result::HouseboundInstance >+ >+=cut >+ >+use strict; >+use warnings; >+ >+use base 'DBIx::Class::Core'; >+ >+=head1 TABLE: C<housebound_instance> >+ >+=cut >+ >+__PACKAGE__->table("housebound_instance"); >+ >+=head1 ACCESSORS >+ >+=head2 instanceid >+ >+ data_type: 'integer' >+ is_auto_increment: 1 >+ is_nullable: 0 >+ >+=head2 hbnumber >+ >+ data_type: 'integer' >+ is_nullable: 0 >+ >+=head2 dmy >+ >+ data_type: 'date' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 1 >+ >+=head2 time >+ >+ data_type: 'mediumtext' >+ is_nullable: 1 >+ >+=head2 borrowernumber >+ >+ data_type: 'integer' >+ is_nullable: 0 >+ >+=head2 volunteer >+ >+ data_type: 'integer' >+ is_nullable: 1 >+ >+=head2 chooser >+ >+ data_type: 'integer' >+ is_nullable: 1 >+ >+=head2 deliverer >+ >+ data_type: 'integer' >+ is_nullable: 1 >+ >+=cut >+ >+__PACKAGE__->add_columns( >+ "instanceid", >+ { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >+ "hbnumber", >+ { data_type => "integer", is_nullable => 0 }, >+ "dmy", >+ { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, >+ "time", >+ { data_type => "mediumtext", is_nullable => 1 }, >+ "borrowernumber", >+ { data_type => "integer", is_nullable => 0 }, >+ "volunteer", >+ { data_type => "integer", is_nullable => 1 }, >+ "chooser", >+ { data_type => "integer", is_nullable => 1 }, >+ "deliverer", >+ { data_type => "integer", is_nullable => 1 }, >+); >+ >+=head1 PRIMARY KEY >+ >+=over 4 >+ >+=item * L</instanceid> >+ >+=back >+ >+=cut >+ >+__PACKAGE__->set_primary_key("instanceid"); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Hi6YuuVAE9fKyyEi8DPhUA >+ >+ >+# You can replace this text with custom code or comments, and it will be preserved on regeneration >+1; >diff --git a/Koha/Schema/Result/Illrequest.pm b/Koha/Schema/Result/Illrequest.pm >index cc56ee16d5..aed8f420fb 100644 >--- a/Koha/Schema/Result/Illrequest.pm >+++ b/Koha/Schema/Result/Illrequest.pm >@@ -54,6 +54,12 @@ __PACKAGE__->table("illrequests"); > is_nullable: 1 > size: 50 > >+=head2 status_alias >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 1 >+ > =head2 placed > > data_type: 'date' >@@ -97,12 +103,6 @@ __PACKAGE__->table("illrequests"); > is_nullable: 1 > size: 20 > >-=head2 price_paid >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 20 >- > =head2 notesopac > > data_type: 'mediumtext' >@@ -125,6 +125,12 @@ __PACKAGE__->table("illrequests"); > is_nullable: 1 > size: 20 > >+=head2 price_paid >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 20 >+ > =cut > > __PACKAGE__->add_columns( >@@ -143,6 +149,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 50 }, > "status", > { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "status_alias", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "placed", > { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, > "replied", >@@ -162,8 +170,6 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 500 }, > "cost", > { data_type => "varchar", is_nullable => 1, size => 20 }, >- "price_paid", >- { data_type => "varchar", is_nullable => 1, size => 20 }, > "notesopac", > { data_type => "mediumtext", is_nullable => 1 }, > "notesstaff", >@@ -172,6 +178,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 50 }, > "backend", > { data_type => "varchar", is_nullable => 1, size => 20 }, >+ "price_paid", >+ { data_type => "varchar", is_nullable => 1, size => 20 }, > ); > > =head1 PRIMARY KEY >@@ -253,9 +261,29 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 status_alias >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::AuthorisedValue> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "status_alias", >+ "Koha::Schema::Result::AuthorisedValue", >+ { id => "status_alias" }, >+ { >+ is_deferrable => 1, >+ join_type => "LEFT", >+ on_delete => "SET NULL", >+ on_update => "CASCADE", >+ }, >+); >+ > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-27 13:16:48 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rv6QyhxEah2r/rDcz3aOOw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kib9BcMRy/expyGSm9sMbQ > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/ImportBatch.pm b/Koha/Schema/Result/ImportBatch.pm >index c2fd81c79a..f4399a66b5 100644 >--- a/Koha/Schema/Result/ImportBatch.pm >+++ b/Koha/Schema/Result/ImportBatch.pm >@@ -99,13 +99,6 @@ __PACKAGE__->table("import_batches"); > extra: {list => ["batch","z3950","webservice"]} > is_nullable: 0 > >-=head2 record_type >- >- data_type: 'enum' >- default_value: 'biblio' >- extra: {list => ["biblio","auth","holdings"]} >- is_nullable: 0 >- > =head2 file_name > > data_type: 'varchar' >@@ -117,6 +110,13 @@ __PACKAGE__->table("import_batches"); > data_type: 'longtext' > is_nullable: 1 > >+=head2 record_type >+ >+ data_type: 'enum' >+ default_value: 'biblio' >+ extra: {list => ["biblio","auth","holdings"]} >+ is_nullable: 0 >+ > =cut > > __PACKAGE__->add_columns( >@@ -192,6 +192,10 @@ __PACKAGE__->add_columns( > extra => { list => ["batch", "z3950", "webservice"] }, > is_nullable => 0, > }, >+ "file_name", >+ { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "comments", >+ { data_type => "longtext", is_nullable => 1 }, > "record_type", > { > data_type => "enum", >@@ -199,10 +203,6 @@ __PACKAGE__->add_columns( > extra => { list => ["biblio", "auth", "holdings"] }, > is_nullable => 0, > }, >- "file_name", >- { data_type => "varchar", is_nullable => 1, size => 100 }, >- "comments", >- { data_type => "longtext", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -235,8 +235,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:41giNJCRD9WXC4IGO/1D3A >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QuFcB7fNnk3jCFKgi8m7fg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Issue.pm b/Koha/Schema/Result/Issue.pm >index e82886aae5..c58863e4ad 100644 >--- a/Koha/Schema/Result/Issue.pm >+++ b/Koha/Schema/Result/Issue.pm >@@ -33,13 +33,13 @@ __PACKAGE__->table("issues"); > > data_type: 'integer' > is_foreign_key: 1 >- is_nullable: 1 >+ is_nullable: 0 > > =head2 itemnumber > > data_type: 'integer' > is_foreign_key: 1 >- is_nullable: 1 >+ is_nullable: 0 > > =head2 date_due > >@@ -123,9 +123,9 @@ __PACKAGE__->add_columns( > "issue_id", > { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, > "borrowernumber", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > "itemnumber", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > "date_due", > { > data_type => "datetime", >@@ -219,12 +219,7 @@ __PACKAGE__->belongs_to( > "borrowernumber", > "Koha::Schema::Result::Borrower", > { borrowernumber => "borrowernumber" }, >- { >- is_deferrable => 1, >- join_type => "LEFT", >- on_delete => "RESTRICT", >- on_update => "CASCADE", >- }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "CASCADE" }, > ); > > =head2 itemnumber >@@ -239,17 +234,12 @@ __PACKAGE__->belongs_to( > "itemnumber", > "Koha::Schema::Result::Item", > { itemnumber => "itemnumber" }, >- { >- is_deferrable => 1, >- join_type => "LEFT", >- on_delete => "RESTRICT", >- on_update => "CASCADE", >- }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "CASCADE" }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-23 13:51:40 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+mlcId4odhAFp3HHgV/+tg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AauWRMNJsFZYKjUkeqtycg > > __PACKAGE__->belongs_to( > "borrower", >diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm >index 106ebd2edb..b301b696f4 100644 >--- a/Koha/Schema/Result/Item.pm >+++ b/Koha/Schema/Result/Item.pm >@@ -150,12 +150,6 @@ __PACKAGE__->table("items"); > is_nullable: 1 > size: 255 > >-=head2 coded_location_qualifier >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 10 >- > =head2 issues > > data_type: 'smallint' >@@ -280,12 +274,20 @@ __PACKAGE__->table("items"); > is_nullable: 1 > size: 32 > >+stores the inventory number >+ > =head2 new_status > > data_type: 'varchar' > is_nullable: 1 > size: 32 > >+=head2 coded_location_qualifier >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 10 >+ > =cut > > __PACKAGE__->add_columns( >@@ -353,8 +355,6 @@ __PACKAGE__->add_columns( > }, > "itemcallnumber", > { data_type => "varchar", is_nullable => 1, size => 255 }, >- "coded_location_qualifier", >- { data_type => "varchar", is_nullable => 1, size => 10 }, > "issues", > { data_type => "smallint", is_nullable => 1 }, > "renewals", >@@ -406,6 +406,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 32 }, > "new_status", > { data_type => "varchar", is_nullable => 1, size => 32 }, >+ "coded_location_qualifier", >+ { data_type => "varchar", is_nullable => 1, size => 10 }, > ); > > =head1 PRIMARY KEY >@@ -671,21 +673,6 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >-=head2 serialitem >- >-Type: might_have >- >-Related object: L<Koha::Schema::Result::Serialitem> >- >-=cut >- >-__PACKAGE__->might_have( >- "serialitem", >- "Koha::Schema::Result::Serialitem", >- { "foreign.itemnumber" => "self.itemnumber" }, >- { cascade_copy => 0, cascade_delete => 0 }, >-); >- > =head2 stockrotationitem > > Type: might_have >@@ -702,8 +689,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-09 15:50:42 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PQvA8qoxvTe4In5/oa5WIQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yCRbfTRcR9gxcdNqyOxNpg > > __PACKAGE__->belongs_to( biblioitem => "Koha::Schema::Result::Biblioitem", "biblioitemnumber" ); > >diff --git a/Koha/Schema/Result/Letter.pm b/Koha/Schema/Result/Letter.pm >index 152cea19c6..b0a0573a9f 100644 >--- a/Koha/Schema/Result/Letter.pm >+++ b/Koha/Schema/Result/Letter.pm >@@ -152,12 +152,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 => "RESTRICT" }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fOuu1Fj8Uo3114QKS2qLkQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XDq2o0wNUEkPuLtfPZiomA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/MarcModificationTemplateAction.pm b/Koha/Schema/Result/MarcModificationTemplateAction.pm >index 6523850ee5..b3b5207a9a 100644 >--- a/Koha/Schema/Result/MarcModificationTemplateAction.pm >+++ b/Koha/Schema/Result/MarcModificationTemplateAction.pm >@@ -44,7 +44,7 @@ __PACKAGE__->table("marc_modification_template_actions"); > > data_type: 'enum' > extra: {list => ["delete_field","add_field","update_field","move_field","copy_field","copy_and_replace_field"]} >- is_nullable: 0 >+ is_nullable: 1 > > =head2 field_number > >@@ -161,7 +161,7 @@ __PACKAGE__->add_columns( > "copy_and_replace_field", > ], > }, >- is_nullable => 0, >+ is_nullable => 1, > }, > "field_number", > { data_type => "smallint", default_value => 0, is_nullable => 0 }, >@@ -235,8 +235,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-19 17:32:57 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dAUr9aGlNZleldYbjJHdmw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:l5ezpD4DzfzsLV+WhOYpAQ > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/MessageAttribute.pm b/Koha/Schema/Result/MessageAttribute.pm >index 8fc01b3f7e..242d4755cf 100644 >--- a/Koha/Schema/Result/MessageAttribute.pm >+++ b/Koha/Schema/Result/MessageAttribute.pm >@@ -32,8 +32,7 @@ __PACKAGE__->table("message_attributes"); > =head2 message_name > > data_type: 'varchar' >- default_value: (empty string) >- is_nullable: 0 >+ is_nullable: 1 > size: 40 > > =head2 takes_days >@@ -48,7 +47,7 @@ __PACKAGE__->add_columns( > "message_attribute_id", > { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, > "message_name", >- { data_type => "varchar", default_value => "", is_nullable => 0, size => 40 }, >+ { data_type => "varchar", is_nullable => 1, size => 40 }, > "takes_days", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > ); >@@ -112,8 +111,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:N033AvWwG2CDBDuTj2unqQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0UOXJDFio/WUDUbc67P1WQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/NeedMergeAuthority.pm b/Koha/Schema/Result/NeedMergeAuthority.pm >index bbe16cefda..2521822c05 100644 >--- a/Koha/Schema/Result/NeedMergeAuthority.pm >+++ b/Koha/Schema/Result/NeedMergeAuthority.pm >@@ -44,6 +44,12 @@ __PACKAGE__->table("need_merge_authorities"); > data_type: 'mediumtext' > is_nullable: 1 > >+=head2 done >+ >+ data_type: 'tinyint' >+ default_value: 0 >+ is_nullable: 1 >+ > =head2 timestamp > > data_type: 'timestamp' >@@ -51,12 +57,6 @@ __PACKAGE__->table("need_merge_authorities"); > default_value: current_timestamp > is_nullable: 0 > >-=head2 done >- >- data_type: 'tinyint' >- default_value: 0 >- is_nullable: 1 >- > =cut > > __PACKAGE__->add_columns( >@@ -68,6 +68,8 @@ __PACKAGE__->add_columns( > { data_type => "bigint", is_nullable => 1 }, > "reportxml", > { data_type => "mediumtext", is_nullable => 1 }, >+ "done", >+ { data_type => "tinyint", default_value => 0, is_nullable => 1 }, > "timestamp", > { > data_type => "timestamp", >@@ -75,8 +77,6 @@ __PACKAGE__->add_columns( > default_value => \"current_timestamp", > is_nullable => 0, > }, >- "done", >- { data_type => "tinyint", default_value => 0, is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -92,8 +92,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("id"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7LzwIYvExKvNgr8/HDZlsg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/QuLsg1gd9kWNnugkDmSBA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OaiSet.pm b/Koha/Schema/Result/OaiSet.pm >index 4081a97bcc..6341189624 100644 >--- a/Koha/Schema/Result/OaiSet.pm >+++ b/Koha/Schema/Result/OaiSet.pm >@@ -125,9 +125,19 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 biblionumbers > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-07-08 15:06:22 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ju63fVMgLPbeFxeZJsQHRQ >+Type: many_to_many >+ >+Composing rels: L</oai_sets_biblios> -> biblionumber >+ >+=cut >+ >+__PACKAGE__->many_to_many("biblionumbers", "oai_sets_biblios", "biblionumber"); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7zp9hrwat3SmXgRedYcXgQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OaiSetsBiblio.pm b/Koha/Schema/Result/OaiSetsBiblio.pm >index 70409ef09c..e5c6147d45 100644 >--- a/Koha/Schema/Result/OaiSetsBiblio.pm >+++ b/Koha/Schema/Result/OaiSetsBiblio.pm >@@ -26,6 +26,7 @@ __PACKAGE__->table("oai_sets_biblios"); > =head2 biblionumber > > data_type: 'integer' >+ is_foreign_key: 1 > is_nullable: 0 > > =head2 set_id >@@ -38,7 +39,7 @@ __PACKAGE__->table("oai_sets_biblios"); > > __PACKAGE__->add_columns( > "biblionumber", >- { data_type => "integer", is_nullable => 0 }, >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > "set_id", > { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > ); >@@ -59,6 +60,21 @@ __PACKAGE__->set_primary_key("biblionumber", "set_id"); > > =head1 RELATIONS > >+=head2 biblionumber >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::Biblio> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "biblionumber", >+ "Koha::Schema::Result::Biblio", >+ { biblionumber => "biblionumber" }, >+ { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+); >+ > =head2 set > > Type: belongs_to >@@ -75,8 +91,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-07-08 15:06:22 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oGVUyyyune8FVOj504xizw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:X8R6Odd2qZpvrY09Z3LOhw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OaiSetsMapping.pm b/Koha/Schema/Result/OaiSetsMapping.pm >index e4dd532d33..2876391bad 100644 >--- a/Koha/Schema/Result/OaiSetsMapping.pm >+++ b/Koha/Schema/Result/OaiSetsMapping.pm >@@ -41,13 +41,6 @@ __PACKAGE__->table("oai_sets_mappings"); > is_nullable: 0 > size: 1 > >-=head2 operator >- >- data_type: 'varchar' >- default_value: 'equal' >- is_nullable: 0 >- size: 8 >- > =head2 marcvalue > > data_type: 'varchar' >@@ -63,13 +56,6 @@ __PACKAGE__->add_columns( > { data_type => "char", is_nullable => 0, size => 3 }, > "marcsubfield", > { data_type => "char", is_nullable => 0, size => 1 }, >- "operator", >- { >- data_type => "varchar", >- default_value => "equal", >- is_nullable => 0, >- size => 8, >- }, > "marcvalue", > { data_type => "varchar", is_nullable => 0, size => 80 }, > ); >@@ -92,8 +78,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:A2fchnI85JftSuruZ1CykQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ISJose/oSjtuVo3EXLzPxA > > > # 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 851f00c90d..8a5e9bed3f 100644 >--- a/Koha/Schema/Result/OldReserve.pm >+++ b/Koha/Schema/Result/OldReserve.pm >@@ -283,14 +283,14 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "SET NULL", >- on_update => "SET NULL", >+ on_delete => "CASCADE", >+ on_update => "CASCADE", > }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ynb6NtiTN8ZZur2YCvxlNg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VFAvF0fzXCBuzgK+hE3eHA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Patronimage.pm b/Koha/Schema/Result/Patronimage.pm >index 8feb4a0ef8..bc27e4470a 100644 >--- a/Koha/Schema/Result/Patronimage.pm >+++ b/Koha/Schema/Result/Patronimage.pm >@@ -26,6 +26,7 @@ __PACKAGE__->table("patronimage"); > =head2 borrowernumber > > data_type: 'integer' >+ default_value: 0 > is_foreign_key: 1 > is_nullable: 0 > >@@ -44,7 +45,12 @@ __PACKAGE__->table("patronimage"); > > __PACKAGE__->add_columns( > "borrowernumber", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ { >+ data_type => "integer", >+ default_value => 0, >+ is_foreign_key => 1, >+ is_nullable => 0, >+ }, > "mimetype", > { data_type => "varchar", is_nullable => 0, size => 15 }, > "imagefile", >@@ -81,8 +87,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:uuRGyWlemwOH1PCkvhqxdQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FlZ4R0S51TTSASvOPzqmrg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Serialitem.pm b/Koha/Schema/Result/Serialitem.pm >index 9a7056335a..7e09fcc1a4 100644 >--- a/Koha/Schema/Result/Serialitem.pm >+++ b/Koha/Schema/Result/Serialitem.pm >@@ -26,7 +26,6 @@ __PACKAGE__->table("serialitems"); > =head2 itemnumber > > data_type: 'integer' >- is_foreign_key: 1 > is_nullable: 0 > > =head2 serialid >@@ -39,7 +38,7 @@ __PACKAGE__->table("serialitems"); > > __PACKAGE__->add_columns( > "itemnumber", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ { data_type => "integer", is_nullable => 0 }, > "serialid", > { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > ); >@@ -58,21 +57,6 @@ __PACKAGE__->set_primary_key("itemnumber"); > > =head1 RELATIONS > >-=head2 itemnumber >- >-Type: belongs_to >- >-Related object: L<Koha::Schema::Result::Item> >- >-=cut >- >-__PACKAGE__->belongs_to( >- "itemnumber", >- "Koha::Schema::Result::Item", >- { itemnumber => "itemnumber" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >-); >- > =head2 serialid > > Type: belongs_to >@@ -89,8 +73,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-04-13 13:53:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Z43jqmURevaJeui7l8ThlQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qAF0pJF5e8AJzxaZqlg13w > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Session.pm b/Koha/Schema/Result/Session.pm >index 38b2aac159..c5a58b9f51 100644 >--- a/Koha/Schema/Result/Session.pm >+++ b/Koha/Schema/Result/Session.pm >@@ -32,7 +32,7 @@ __PACKAGE__->table("sessions"); > =head2 a_session > > data_type: 'longtext' >- is_nullable: 0 >+ is_nullable: 1 > > =cut > >@@ -40,7 +40,7 @@ __PACKAGE__->add_columns( > "id", > { data_type => "varchar", is_nullable => 0, size => 32 }, > "a_session", >- { data_type => "longtext", is_nullable => 0 }, >+ { data_type => "longtext", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -56,8 +56,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("id"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YyoQx5Kb6G7W0CVV96chpQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Y/66MvcHQG0Urlv4Q+7ItQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Stockrotationrota.pm b/Koha/Schema/Result/Stockrotationrota.pm >index aae6f69ec2..6f5692378f 100644 >--- a/Koha/Schema/Result/Stockrotationrota.pm >+++ b/Koha/Schema/Result/Stockrotationrota.pm >@@ -38,7 +38,7 @@ __PACKAGE__->table("stockrotationrotas"); > =head2 description > > data_type: 'text' >- is_nullable: 0 >+ is_nullable: 1 > > =head2 cyclical > >@@ -60,7 +60,7 @@ __PACKAGE__->add_columns( > "title", > { data_type => "varchar", is_nullable => 0, size => 100 }, > "description", >- { data_type => "text", is_nullable => 0 }, >+ { data_type => "text", is_nullable => 1 }, > "cyclical", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "active", >@@ -79,6 +79,20 @@ __PACKAGE__->add_columns( > > __PACKAGE__->set_primary_key("rota_id"); > >+=head1 UNIQUE CONSTRAINTS >+ >+=head2 C<stockrotationrotas_title> >+ >+=over 4 >+ >+=item * L</title> >+ >+=back >+ >+=cut >+ >+__PACKAGE__->add_unique_constraint("stockrotationrotas_title", ["title"]); >+ > =head1 RELATIONS > > =head2 stockrotationstages >@@ -97,8 +111,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-09 15:50:42 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lTIDZ+w+46Kniub5Tqpqlg >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HrZO2r+/Warg22jZTBH6YQ > > __PACKAGE__->add_columns( > '+cyclical' => { is_boolean => 1 }, >diff --git a/Koha/Schema/Result/Subscription.pm b/Koha/Schema/Result/Subscription.pm >index c493b73b60..b16c254f4a 100644 >--- a/Koha/Schema/Result/Subscription.pm >+++ b/Koha/Schema/Result/Subscription.pm >@@ -113,15 +113,15 @@ __PACKAGE__->table("subscription"); > data_type: 'integer' > is_nullable: 1 > >-=head2 innerloop1 >+=head2 lastvalue2 > > data_type: 'integer' >- default_value: 0 > is_nullable: 1 > >-=head2 lastvalue2 >+=head2 innerloop1 > > data_type: 'integer' >+ default_value: 0 > is_nullable: 1 > > =head2 innerloop2 >@@ -130,15 +130,15 @@ __PACKAGE__->table("subscription"); > default_value: 0 > is_nullable: 1 > >-=head2 lastvalue3 >+=head2 innerloop3 > > data_type: 'integer' >+ default_value: 0 > is_nullable: 1 > >-=head2 innerloop3 >+=head2 lastvalue3 > > data_type: 'integer' >- default_value: 0 > is_nullable: 1 > > =head2 firstacquidate >@@ -304,16 +304,16 @@ __PACKAGE__->add_columns( > { data_type => "varchar", default_value => "", is_nullable => 0, size => 100 }, > "lastvalue1", > { data_type => "integer", is_nullable => 1 }, >- "innerloop1", >- { data_type => "integer", default_value => 0, is_nullable => 1 }, > "lastvalue2", > { data_type => "integer", is_nullable => 1 }, >+ "innerloop1", >+ { data_type => "integer", default_value => 0, is_nullable => 1 }, > "innerloop2", > { data_type => "integer", default_value => 0, is_nullable => 1 }, >- "lastvalue3", >- { data_type => "integer", is_nullable => 1 }, > "innerloop3", > { data_type => "integer", default_value => 0, is_nullable => 1 }, >+ "lastvalue3", >+ { data_type => "integer", is_nullable => 1 }, > "firstacquidate", > { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, > "manualhistory", >@@ -429,24 +429,9 @@ __PACKAGE__->belongs_to( > }, > ); > >-=head2 subscriptionroutinglists >- >-Type: has_many >- >-Related object: L<Koha::Schema::Result::Subscriptionroutinglist> >- >-=cut >- >-__PACKAGE__->has_many( >- "subscriptionroutinglists", >- "Koha::Schema::Result::Subscriptionroutinglist", >- { "foreign.subscriptionid" => "self.subscriptionid" }, >- { cascade_copy => 0, cascade_delete => 0 }, >-); >- > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZRLfM/4h8VMLTgW7LkUYYA >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YEnhBEHShtX7EOGZ72E3tg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Subscriptionroutinglist.pm b/Koha/Schema/Result/Subscriptionroutinglist.pm >index 7741142229..f08b507fb8 100644 >--- a/Koha/Schema/Result/Subscriptionroutinglist.pm >+++ b/Koha/Schema/Result/Subscriptionroutinglist.pm >@@ -43,7 +43,6 @@ __PACKAGE__->table("subscriptionroutinglist"); > =head2 subscriptionid > > data_type: 'integer' >- is_foreign_key: 1 > is_nullable: 0 > > =cut >@@ -56,7 +55,7 @@ __PACKAGE__->add_columns( > "ranking", > { data_type => "integer", is_nullable => 1 }, > "subscriptionid", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ { data_type => "integer", is_nullable => 0 }, > ); > > =head1 PRIMARY KEY >@@ -104,24 +103,9 @@ __PACKAGE__->belongs_to( > { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, > ); > >-=head2 subscriptionid >- >-Type: belongs_to >- >-Related object: L<Koha::Schema::Result::Subscription> >- >-=cut >- >-__PACKAGE__->belongs_to( >- "subscriptionid", >- "Koha::Schema::Result::Subscription", >- { subscriptionid => "subscriptionid" }, >- { is_deferrable => 1, on_delete => "CASCADE", 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:AK595c56vgTa7ZjwZjberw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AWnpmHLU+knqkuZiPbiWxQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Suggestion.pm b/Koha/Schema/Result/Suggestion.pm >index ac08c1e5c1..3361ba6f88 100644 >--- a/Koha/Schema/Result/Suggestion.pm >+++ b/Koha/Schema/Result/Suggestion.pm >@@ -35,45 +35,11 @@ __PACKAGE__->table("suggestions"); > default_value: 0 > is_nullable: 0 > >-=head2 suggesteddate >- >- data_type: 'date' >- datetime_undef_if_invalid: 1 >- is_nullable: 0 >- > =head2 managedby > > data_type: 'integer' > is_nullable: 1 > >-=head2 manageddate >- >- data_type: 'date' >- datetime_undef_if_invalid: 1 >- is_nullable: 1 >- >-=head2 acceptedby >- >- data_type: 'integer' >- is_nullable: 1 >- >-=head2 accepteddate >- >- data_type: 'date' >- datetime_undef_if_invalid: 1 >- is_nullable: 1 >- >-=head2 rejectedby >- >- data_type: 'integer' >- is_nullable: 1 >- >-=head2 rejecteddate >- >- data_type: 'date' >- datetime_undef_if_invalid: 1 >- is_nullable: 1 >- > =head2 STATUS > > accessor: 'status' >@@ -168,6 +134,40 @@ __PACKAGE__->table("suggestions"); > is_nullable: 1 > size: 10 > >+=head2 acceptedby >+ >+ data_type: 'integer' >+ is_nullable: 1 >+ >+=head2 accepteddate >+ >+ data_type: 'date' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 1 >+ >+=head2 suggesteddate >+ >+ data_type: 'date' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 0 >+ >+=head2 manageddate >+ >+ data_type: 'date' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 1 >+ >+=head2 rejectedby >+ >+ data_type: 'integer' >+ is_nullable: 1 >+ >+=head2 rejecteddate >+ >+ data_type: 'date' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 1 >+ > =head2 collectiontitle > > data_type: 'mediumtext' >@@ -209,20 +209,8 @@ __PACKAGE__->add_columns( > { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, > "suggestedby", > { data_type => "integer", default_value => 0, is_nullable => 0 }, >- "suggesteddate", >- { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 0 }, > "managedby", > { data_type => "integer", is_nullable => 1 }, >- "manageddate", >- { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, >- "acceptedby", >- { data_type => "integer", is_nullable => 1 }, >- "accepteddate", >- { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, >- "rejectedby", >- { data_type => "integer", is_nullable => 1 }, >- "rejecteddate", >- { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, > "STATUS", > { > accessor => "status", >@@ -266,6 +254,18 @@ __PACKAGE__->add_columns( > { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "branchcode", > { data_type => "varchar", is_nullable => 1, size => 10 }, >+ "acceptedby", >+ { data_type => "integer", is_nullable => 1 }, >+ "accepteddate", >+ { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, >+ "suggesteddate", >+ { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 0 }, >+ "manageddate", >+ { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, >+ "rejectedby", >+ { data_type => "integer", is_nullable => 1 }, >+ "rejecteddate", >+ { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, > "collectiontitle", > { data_type => "mediumtext", is_nullable => 1 }, > "itemtype", >@@ -315,8 +315,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dOt4/U4rLcXq+aACRwcpYw >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9ovjDSyWFUtxt4qShR1RiA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/VendorEdiAccount.pm b/Koha/Schema/Result/VendorEdiAccount.pm >index e8e7d810fc..56ede3ddab 100644 >--- a/Koha/Schema/Result/VendorEdiAccount.pm >+++ b/Koha/Schema/Result/VendorEdiAccount.pm >@@ -133,7 +133,6 @@ __PACKAGE__->table("vendor_edi_accounts"); > =head2 plugin > > data_type: 'varchar' >- default_value: (empty string) > is_nullable: 0 > size: 256 > >@@ -177,7 +176,7 @@ __PACKAGE__->add_columns( > "shipment_budget", > { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "plugin", >- { data_type => "varchar", default_value => "", is_nullable => 0, size => 256 }, >+ { data_type => "varchar", is_nullable => 0, size => 256 }, > ); > > =head1 PRIMARY KEY >@@ -250,8 +249,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TtWuTpP4Ac6/+T6OPMSsRA >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-08 11:09:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QPYU9DYwSAyCFB99vrAMzA > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >-- >2.11.0
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 20581
:
74323
|
74324
|
74325
|
74326
|
74327
|
74362
|
75333
|
75334
|
75810
|
77819
|
77820
|
77821
|
77822
|
77823
|
77824
|
77825
|
77826
|
78376
|
78377
|
78378
|
78379
|
78380
|
78381
|
78382
|
78383
|
78384
|
78431
|
78515
|
78516
|
78517
|
78518
|
78519
|
78520
|
78521
|
78522
|
78523
|
80279
|
80280
|
80281
|
80282
|
80283
|
80284
|
80285
|
80286
|
80474
|
80475
|
80501
|
80503
|
80505
|
80598
|
80599
|
80600
|
82063
|
82064
|
82065
|
82066
|
82067
|
82068
|
82069
|
82070
|
82071
|
82072
|
82073
|
82074
|
82075
|
82076
|
82443
|
82444
|
82445
|
82446
|
82447
|
82448
|
82449
|
82450
|
82451
|
82452
|
82453
|
82454
|
82455
|
82456
|
82457
|
82458
|
82459
|
82460
|
82461
|
82462
|
82463
|
82464
|
82465
|
82466
|
82467
|
82468
|
82472
|
82483
|
82484
|
82485
|
82486
|
82487
|
82488
|
82489
|
82490
|
82491
|
82492
|
82493
|
82494
|
82495
|
82496
|
82733
|
84202
|
84404
|
84768
|
84770
|
84771
|
84772
|
84773
|
84774
|
84775
|
84776
|
84777
|
84778
|
84779
|
84780
|
84781
|
84782
|
84783
|
84784
|
84785
|
84791
|
84814
|
84818
|
84819
|
84844
|
84911
|
84912
|
84913
|
84914
|
84915
|
84916
|
84917
|
84918
|
84919
|
84920
|
84921
|
84922
|
84923
|
84924
|
84925
|
84926
|
84927
|
84928
|
84929
|
84930
|
84931
|
84964
|
85075
|
85076
|
85077
|
85078
|
85079
|
85080
|
85081
|
85082
|
85083
|
85084
|
85085
|
85086
|
85087
|
85088
|
85089
|
85090
|
85091
|
85092
|
85093
|
85094
|
85095
|
85096