From: Rafael Kitover Date: Thu, 29 Mar 2012 01:50:47 +0000 (-0400) Subject: release 0.07019 X-Git-Tag: 0.07019^0 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=22f91663244e30dd4bcae10e54a761113f3a587c;p=dbsrgits%2FDBIx-Class-Schema-Loader.git release 0.07019 Also remove a leftover ->_lc call in ::DBI::_columns_info_for that was screwing things up. --- diff --git a/Changes b/Changes index e4e82fa..4fdbd20 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,6 @@ Revision history for Perl extension DBIx::Class::Schema::Loader +0.07019 2012-03-28 17:23:09 - fix some errors due to case issues (RT#75805) 0.07018 2012-03-27 05:55:10 diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm index ea0fe2c..9d1cb2b 100644 --- a/lib/DBIx/Class/Schema/Loader.pm +++ b/lib/DBIx/Class/Schema/Loader.pm @@ -14,7 +14,7 @@ use namespace::clean; # Always remember to do all digits for the version even if they're 0 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports # brain damage and presumably various other packaging systems too -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; __PACKAGE__->mk_group_accessors('inherited', qw/ _loader_args diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm index fde0a2e..bba84e3 100644 --- a/lib/DBIx/Class/Schema/Loader/Base.pm +++ b/lib/DBIx/Class/Schema/Loader/Base.pm @@ -28,7 +28,7 @@ use List::MoreUtils qw/all any firstidx uniq/; use File::Temp 'tempfile'; use namespace::clean; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; __PACKAGE__->mk_group_ro_accessors('simple', qw/ schema diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm index 13de355..131b3d3 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -10,7 +10,7 @@ use Carp::Clan qw/^DBIx::Class/; use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; __PACKAGE__->mk_group_accessors('simple', qw/ _disable_pk_detection @@ -484,7 +484,7 @@ sub _columns_info_for { my @columns = @{ $sth->{NAME} }; COL: for my $i (0 .. $#columns) { - next COL if %{ $result{ $self->_lc($columns[$i]) }||{} }; + next COL if %{ $result{ $columns[$i] }||{} }; my $column_info = {}; $column_info->{data_type} = lc $sth->{TYPE}[$i]; diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm b/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm index 4ab9c10..02b598d 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::DBI'; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm b/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm index 5dd48f2..5c29695 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm @@ -10,7 +10,7 @@ use mro 'c3'; use Try::Tiny; use namespace::clean; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm index a74268d..231a3ac 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm @@ -8,7 +8,7 @@ use base qw/ /; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm b/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm index 4b82127..cf97f70 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm @@ -4,7 +4,7 @@ use strict; use warnings; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm index f150c72..d29303b 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm @@ -13,7 +13,7 @@ use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Firebird.pm b/lib/DBIx/Class/Schema/Loader/DBI/Firebird.pm index 389c5f5..b3d1b2d 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Firebird.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Firebird.pm @@ -5,7 +5,7 @@ use warnings; use base qw/DBIx::Class::Schema::Loader::DBI::InterBase/; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm b/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm index 9d378dd..daba68c 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm @@ -10,7 +10,7 @@ use Try::Tiny; use namespace::clean; use DBIx::Class::Schema::Loader::Table::Informix (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm b/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm index a1197cd..4c934af 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm @@ -9,7 +9,7 @@ use List::Util 'first'; use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; sub _supports_db_schema { 0 } diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm index 0653228..49d98d7 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm @@ -10,7 +10,7 @@ use namespace::clean; use DBIx::Class::Schema::Loader::Table::Sybase (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm index 5d15cb6..c8ea2c6 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::DBI'; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm index 4005fb9..274dece 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm @@ -10,7 +10,7 @@ use Try::Tiny; use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; __PACKAGE__->mk_group_accessors('simple', qw/ __ado_connection diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm index 63bd16e..411a876 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm @@ -8,7 +8,7 @@ use base qw/ /; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm index e84da49..cc7c37e 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm @@ -8,7 +8,7 @@ use base qw/ /; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm index 03a76b9..ac725d3 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm @@ -8,7 +8,7 @@ use base qw/ /; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm index 9b46cd9..c09da67 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm @@ -10,7 +10,7 @@ use mro 'c3'; use Try::Tiny; use namespace::clean; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm index 95dd8f4..0745bd9 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm @@ -8,7 +8,7 @@ use base qw/ /; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm b/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm index e53d7c9..5428500 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm @@ -11,7 +11,7 @@ use List::MoreUtils 'any'; use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm index aa207eb..7154a1c 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm @@ -9,7 +9,7 @@ use base qw/ use mro 'c3'; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm index 1cff0d8..30d7b3b 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm @@ -9,7 +9,7 @@ use namespace::clean; use DBIx::Class::Schema::Loader::Table::Sybase (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm index 0648128..3e77049 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::DBI'; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm index e28a589..bb7a099 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::DBI::MSSQL'; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm b/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm index ad9a902..429b418 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm @@ -1,7 +1,7 @@ package DBIx::Class::Schema::Loader::DBI::Writing; use strict; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; # Empty. POD only. diff --git a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm index 15efc62..96a2e79 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm @@ -8,10 +8,11 @@ use Carp::Clan qw/^DBIx::Class/; use List::Util 'first'; use List::MoreUtils 'any'; use Try::Tiny; +use Scalar::Util 'blessed'; use namespace::clean; use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; =head1 NAME @@ -279,7 +280,8 @@ sub _extra_column_info { if ($dbi_info->{mysql_values}) { $extra_info{extra}{list} = $dbi_info->{mysql_values}; } - if ( lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp' + if ((not blessed $dbi_info) # isa $sth + && lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp' && lc($dbi_info->{mysql_type_name}) eq 'timestamp') { my $current_timestamp = 'current_timestamp'; diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm index 004cb93..d062c4c 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm @@ -18,7 +18,7 @@ use String::ToIdentifier::EN::Unicode (); use Class::Unload (); use Class::Inspector (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; # Glossary: # diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm index f97ba9a..374529f 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05'; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; sub _relnames_and_method { my ( $self, $local_moniker, $rel, $cond, $uniqs, $counters ) = @_; diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm index fcf7805..ceb18c9 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm @@ -8,7 +8,7 @@ use DBIx::Class::Schema::Loader::Utils 'array_eq'; use namespace::clean; use Lingua::EN::Inflect::Number (); -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; sub _to_PL { my ($self, $name) = @_; diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm index 5d8824d..820d6ab 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm @@ -5,7 +5,7 @@ use warnings; use base 'DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_07'; use mro 'c3'; -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; sub _normalize_name { my ($self, $name) = @_; diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_07.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_07.pm index e18bdb2..af45a34 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_07.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_07.pm @@ -17,7 +17,7 @@ L. =cut -our $VERSION = '0.07018'; +our $VERSION = '0.07019'; sub _strip_id_postfix { my ($self, $name) = @_;