[Bast-commits] r9518 - DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-06-01 15:56:48 +0100 (Tue, 01 Jun 2010)
New Revision: 9518

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Pg.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/SQLite.pm
Log:
pass postgres_version in producer_args when deploying to Pg

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Pg.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Pg.pm	2010-06-01 14:46:52 UTC (rev 9517)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Pg.pm	2010-06-01 14:56:48 UTC (rev 9518)
@@ -199,6 +199,19 @@
     $self->_get_dbh->pg_rollback_to($name);
 }
 
+sub deployment_statements {
+  my $self = shift;;
+  my ($schema, $type, $version, $dir, $sqltargs, @rest) = @_;
+
+  $sqltargs ||= {};
+
+  if (my $version = $self->_server_info->{normalized_dbms_version}) {
+    $sqltargs->{producer_args}{postgres_version} = $version;
+  }
+
+  $self->next::method($schema, $type, $version, $dir, $sqltargs, @rest);
+}
+
 1;
 
 __END__

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/SQLite.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/SQLite.pm	2010-06-01 14:46:52 UTC (rev 9517)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/SQLite.pm	2010-06-01 14:56:48 UTC (rev 9518)
@@ -50,12 +50,8 @@
 
   $sqltargs ||= {};
 
-  # it'd be cool to use the normalized perl-style version but this needs sqlt hacking as well
-  if (my $sqlite_version = $self->_server_info->{dbms_version}) {
-    # numify, SQLT does a numeric comparison
-    $sqlite_version =~ s/^(\d+) \. (\d+) (?: \. (\d+))? .*/${1}.${2}/x;
-
-    $sqltargs->{producer_args}{sqlite_version} = $sqlite_version if $sqlite_version;
+  if (my $version = $self->_server_info->{normalized_dbms_version}) {
+    $sqltargs->{producer_args}{sqlite_version} = $version;
   }
 
   $self->next::method($schema, $type, $version, $dir, $sqltargs, @rest);