X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FSQLite.pm;h=766eb132bab908762132ca631f9c118f062b64e1;hb=7d3139ac1ff52213e2dad35fc9c9d1057711256a;hp=186cb60e922c177dfefe48972ee5fefa3fb9d3f8;hpb=6d766626a066b757058d023830f93cf39bb9c302;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Storage/DBI/SQLite.pm b/lib/DBIx/Class/Storage/DBI/SQLite.pm
index 186cb60..766eb13 100644
--- a/lib/DBIx/Class/Storage/DBI/SQLite.pm
+++ b/lib/DBIx/Class/Storage/DBI/SQLite.pm
@@ -10,7 +10,8 @@ use POSIX 'strftime';
 use File::Copy;
 use File::Spec;
 
-__PACKAGE__->sql_maker_class('DBIx::Class::SQLAHacks::SQLite');
+__PACKAGE__->sql_maker_class('DBIx::Class::SQLMaker::SQLite');
+__PACKAGE__->sql_limit_dialect ('LimitOffset');
 
 sub backup
 {
@@ -45,17 +46,17 @@ sub backup
 }
 
 sub deployment_statements {
-  my $self = shift;;
+  my $self = shift;
   my ($schema, $type, $version, $dir, $sqltargs, @rest) = @_;
 
   $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 (
+    ! exists $sqltargs->{producer_args}{sqlite_version}
+      and
+    my $dver = $self->_server_info->{normalized_dbms_version}
+  ) {
+    $sqltargs->{producer_args}{sqlite_version} = $dver;
   }
 
   $self->next::method($schema, $type, $version, $dir, $sqltargs, @rest);