From: Galen Charlton <gmc@esilibrary.com>
Date: Wed, 18 Jun 2014 22:25:22 +0000 (+0000)
Subject: Bug 11891: (follow-up) remove custom storage class
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=967f5cb51321a6a08176c7718a6ab933b3b5f926;p=koha_fer

Bug 11891: (follow-up) remove custom storage class

For now, just rely on the normal DBIx::Class cleanup handler;
otherwise, the following warning is displayed in logs:

  (in cleanup) Can't locate object method "_preserve_foreign_dbh" via package "Koha::Storage" at .../Koha/Storage.pm

Using the default DBIC storage class also means that we
don't have to manually do things like set the SQL limit dialect;
meaning that we don't get the following warning message:

  DBIx::Class::ResultSet::find(): Your storage class (Koha::Storage) does
  not set sql_limit_dialect and you have not supplied an explicit
  limit_dialect in your connection_info. DBIC will attempt to use the
  GenericSubQ dialect, which works on most databases but can be (and
  often is) painfully slow. Please file an RT ticket against
  'Koha::Storage' . at /home/gmc/koha/C4/Members.pm line 840

Test plan: same as main patch

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---

diff --git a/Koha/Schema.pm b/Koha/Schema.pm
index 111855c78a..cffc631d5e 100644
--- a/Koha/Schema.pm
+++ b/Koha/Schema.pm
@@ -15,6 +15,6 @@ __PACKAGE__->load_namespaces;
 # Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oDUxXckmfk6H9YCjW8PZTw
 
-__PACKAGE__->storage_type('Koha::Storage');
 
+# You can replace this text with custom content, and it will be preserved on regeneration
 1;
diff --git a/Koha/Storage.pm b/Koha/Storage.pm
deleted file mode 100644
index 599b6a19ff..0000000000
--- a/Koha/Storage.pm
+++ /dev/null
@@ -1,16 +0,0 @@
-use utf8;
-package Koha::Storage;
-
-use strict;
-use warnings;
-
-use base 'DBIx::Class::Storage::DBI';
-sub DESTROY {
-    my $self = shift;
-
-    # destroy just the object if not native to this process/thread
-    $self->_preserve_foreign_dbh;
-
-    $self->_dbh(undef);
-}
-1;