Bugzilla – Attachment 48703 Details for
Bug 15084
Move the currency related code to Koha::Acquisition::Currenc[y|ies]
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15084 [QA Followup] - Update Schema files
Bug-15084-QA-Followup---Update-Schema-files.patch (text/plain), 8.03 KB, created by
Kyle M Hall
on 2016-03-04 19:42:13 UTC
(
hide
)
Description:
Bug 15084 [QA Followup] - Update Schema files
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2016-03-04 19:42:13 UTC
Size:
8.03 KB
patch
obsolete
>From 59b8937170c0183dce908b6404cda8891c00b85b Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 4 Mar 2016 19:41:21 +0000 >Subject: [PATCH] Bug 15084 [QA Followup] - Update Schema files > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > Koha/Schema/Result/Currency.pm | 27 ++------------------------- > Koha/Schema/Result/Deletedborrower.pm | 12 ++++++------ > Koha/Schema/Result/Deleteditem.pm | 13 +++++++++++-- > Koha/Schema/Result/Item.pm | 13 +++++++++++-- > Koha/Schema/Result/TagAll.pm | 15 ++++++++++----- > Koha/Schema/Result/TagsApproval.pm | 6 +++--- > 6 files changed, 43 insertions(+), 43 deletions(-) > >diff --git a/Koha/Schema/Result/Currency.pm b/Koha/Schema/Result/Currency.pm >index 82f68f3..a8b5e5e 100644 >--- a/Koha/Schema/Result/Currency.pm >+++ b/Koha/Schema/Result/Currency.pm >@@ -60,12 +60,6 @@ __PACKAGE__->table("currency"); > data_type: 'tinyint' > is_nullable: 1 > >-=head2 archived >- >- data_type: 'tinyint' >- default_value: 0 >- is_nullable: 1 >- > =cut > > __PACKAGE__->add_columns( >@@ -86,8 +80,6 @@ __PACKAGE__->add_columns( > { data_type => "float", is_nullable => 1, size => [15, 5] }, > "active", > { data_type => "tinyint", is_nullable => 1 }, >- "archived", >- { data_type => "tinyint", default_value => 0, is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -134,24 +126,9 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >-=head2 aqorders >- >-Type: has_many >- >-Related object: L<Koha::Schema::Result::Aqorder> >- >-=cut >- >-__PACKAGE__->has_many( >- "aqorders", >- "Koha::Schema::Result::Aqorder", >- { "foreign.currency" => "self.currency" }, >- { cascade_copy => 0, cascade_delete => 0 }, >-); >- > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-12-17 10:57:24 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:B9JY/pDkp8icT7m0xDDKAA >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-04 19:32:39 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:o9IAcoQ0uxMdl0zZ0M0agw > > > # 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 57cea85..0207fba 100644 >--- a/Koha/Schema/Result/Deletedborrower.pm >+++ b/Koha/Schema/Result/Deletedborrower.pm >@@ -293,7 +293,7 @@ __PACKAGE__->table("deletedborrowers"); > > data_type: 'varchar' > is_nullable: 1 >- size: 30 >+ size: 60 > > =head2 flags > >@@ -304,7 +304,7 @@ __PACKAGE__->table("deletedborrowers"); > > data_type: 'varchar' > is_nullable: 1 >- size: 30 >+ size: 75 > > =head2 opacnote > >@@ -522,11 +522,11 @@ __PACKAGE__->add_columns( > "sex", > { data_type => "varchar", is_nullable => 1, size => 1 }, > "password", >- { data_type => "varchar", is_nullable => 1, size => 30 }, >+ { data_type => "varchar", is_nullable => 1, size => 60 }, > "flags", > { data_type => "integer", is_nullable => 1 }, > "userid", >- { data_type => "varchar", is_nullable => 1, size => 30 }, >+ { data_type => "varchar", is_nullable => 1, size => 75 }, > "opacnote", > { data_type => "mediumtext", is_nullable => 1 }, > "contactnote", >@@ -564,8 +564,8 @@ __PACKAGE__->add_columns( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-02-14 12:46:14 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UvGAnZ1qOwgtmLpbG8ukow >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-04 19:32:39 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UqTaMlpDnOWlhfQyF5EjHA > > > # 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 63ca492..12dda35 100644 >--- a/Koha/Schema/Result/Deleteditem.pm >+++ b/Koha/Schema/Result/Deleteditem.pm >@@ -270,6 +270,13 @@ __PACKAGE__->table("deleteditems"); > is_nullable: 1 > size: 32 > >+=head2 new >+ >+ accessor: undef >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 32 >+ > =cut > > __PACKAGE__->add_columns( >@@ -372,6 +379,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 32 }, > "stocknumber", > { data_type => "varchar", is_nullable => 1, size => 32 }, >+ "new", >+ { accessor => undef, data_type => "varchar", is_nullable => 1, size => 32 }, > ); > > =head1 PRIMARY KEY >@@ -387,8 +396,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("itemnumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-04-23 12:42:12 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+aDMnEj1EvLQTQPAEl1ocg >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-04 19:32:39 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uu6dMCUUlDOkveF9SYkKew > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm >index c370d86..c3c4b33 100644 >--- a/Koha/Schema/Result/Item.pm >+++ b/Koha/Schema/Result/Item.pm >@@ -273,6 +273,13 @@ __PACKAGE__->table("items"); > is_nullable: 1 > size: 32 > >+=head2 new >+ >+ accessor: undef >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 32 >+ > =cut > > __PACKAGE__->add_columns( >@@ -380,6 +387,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 32 }, > "stocknumber", > { data_type => "varchar", is_nullable => 1, size => 32 }, >+ "new", >+ { accessor => undef, data_type => "varchar", is_nullable => 1, size => 32 }, > ); > > =head1 PRIMARY KEY >@@ -631,8 +640,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-01-06 12:00:28 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3M6BvB4ATsBXgQCkFKuI3A >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-04 19:32:39 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rhW0Ddhh2hLoV//7nonLCA > > __PACKAGE__->belongs_to( biblioitem => "Koha::Schema::Result::Biblioitem", "biblioitemnumber" ); > >diff --git a/Koha/Schema/Result/TagAll.pm b/Koha/Schema/Result/TagAll.pm >index ca1a470..99d1e03 100644 >--- a/Koha/Schema/Result/TagAll.pm >+++ b/Koha/Schema/Result/TagAll.pm >@@ -33,7 +33,7 @@ __PACKAGE__->table("tags_all"); > > data_type: 'integer' > is_foreign_key: 1 >- is_nullable: 0 >+ is_nullable: 1 > > =head2 biblionumber > >@@ -64,7 +64,7 @@ __PACKAGE__->add_columns( > "tag_id", > { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, > "borrowernumber", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "biblionumber", > { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, > "term", >@@ -120,12 +120,17 @@ __PACKAGE__->belongs_to( > "borrowernumber", > "Koha::Schema::Result::Borrower", > { borrowernumber => "borrowernumber" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { >+ is_deferrable => 1, >+ join_type => "LEFT", >+ 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:xhJn9d2lS8crFWog28ENnw >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-04 19:32:39 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gyjzwAoUL27c/7NqM8+RaA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/TagsApproval.pm b/Koha/Schema/Result/TagsApproval.pm >index 50abeb2..9df9cc9 100644 >--- a/Koha/Schema/Result/TagsApproval.pm >+++ b/Koha/Schema/Result/TagsApproval.pm >@@ -101,7 +101,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "CASCADE", >+ on_delete => "SET NULL", > on_update => "CASCADE", > }, > ); >@@ -122,8 +122,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:TcnMQQTB5F8hjyLoJ7VBHQ >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-03-04 19:32:39 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:V6O4TG3vfkRovbGgNP3HmA > > > # You can replace this text with custom content, and it will be preserved on regeneration >-- >2.1.4
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 15084
:
44162
|
44163
|
44164
|
44165
|
44166
|
44167
|
44168
|
45690
|
45691
|
45692
|
45693
|
45694
|
45695
|
45696
|
45759
|
45761
|
45807
|
45808
|
45809
|
45810
|
45811
|
45812
|
45813
|
45814
|
47213
|
47214
|
47215
|
47216
|
47217
|
47218
|
47219
|
47220
|
47221
|
48594
|
48595
|
48596
|
48597
|
48598
|
48599
|
48600
|
48601
|
48602
|
48603
| 48703 |
48747
|
48772
|
48783
|
48858