[Bast-commits] r5860 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader/DBI

[ilmari at dev.catalyst.perl.org]

Author: ilmari
Date: 2009-04-08 00:53:22 +0100 (Wed, 08 Apr 2009)
New Revision: 5860

Modified:
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
Log:
Fix SQLite _extra_column_info for new DBD::SQLite which ->can('column_info')

Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2009-04-07 16:37:24 UTC (rev 5859)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2009-04-07 23:53:22 UTC (rev 5860)
@@ -3,6 +3,7 @@
 0.04999_07 Not Yet Released
         - Add result_base_class and schema_base_class options (RT #43977)
         - Ignore duplicate uniq indices (including duplicates of the PK).
+        - Fix for DBD::SQLite 1.20
 
 0.04999_06 Tue Nov 11, 2008
         - Singularise table monikers by default

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm	2009-04-07 16:37:24 UTC (rev 5859)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm	2009-04-07 23:53:22 UTC (rev 5860)
@@ -148,6 +148,7 @@
 
 sub _extra_column_info {
     my ($self, $table, $col_name, $sth, $col_num) = @_;
+    ($table, $col_name) = @{$table}{qw/TABLE_NAME COLUMN_NAME/} if ref $table;
     my %extra_info;
 
     $self->{_sqlite_parse_data}->{$table} ||=