X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FSQLite.pm;h=c5af1305c4e83ad167d93acdd16031e355955d7a;hb=9f333983b7e706ffb7ea29839dbb3dc5d3012846;hp=c29f4d33bb110f61ef2b5d1db283e49580a99ebd;hpb=692193496082e4b69bcd80d02999371d20d874ba;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
index c29f4d3..c5af130 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
@@ -10,7 +10,7 @@ use Carp::Clan qw/^DBIx::Class/;
 use Text::Balanced qw( extract_bracketed );
 use Class::C3;
 
-our $VERSION = '0.07000';
+our $VERSION = '0.07001';
 
 =head1 NAME
 
@@ -80,9 +80,17 @@ sub _columns_info_for {
     $sth->execute;
     my $cols = $sth->fetchall_hashref('name');
 
+    my ($num_pk, $pk_col) = (0);
+    # SQLite doesn't give us the info we need to do this nicely :(
+    # If there is exactly one column marked PK, and its type is integer,
+    # set it is_auto_increment. This isn't 100%, but it's better than the
+    # alternatives.
     while (my ($col_name, $info) = each %$result) {
-      if ($cols->{$col_name}{pk} && lc($cols->{$col_name}{type}) eq 'integer') {
-        $info->{is_auto_increment} = 1;
+      if ($cols->{$col_name}{pk}) {
+        $num_pk ++;
+        if (lc($cols->{$col_name}{type}) eq 'integer') {
+          $pk_col = $col_name;
+        }
       }
     }
 
@@ -90,6 +98,9 @@ sub _columns_info_for {
         if ((eval { ${ $info->{default_value} } }||'') eq 'CURRENT_TIMESTAMP') {
             ${ $info->{default_value} } = 'current_timestamp';
         }
+        if ($num_pk == 1 and defined $pk_col and $pk_col eq $col) {
+          $info->{is_auto_increment} = 1;
+        }
     }
 
     return $result;
@@ -134,6 +145,7 @@ sub _table_uniq_info {
     my @uniqs;
     while (my $idx = $sth->fetchrow_hashref) {
         next unless $idx->{unique};
+
         my $name = $idx->{name};
 
         my $get_idx_sth = $dbh->prepare("pragma index_info(" . $dbh->quote($name) . ")");
@@ -143,6 +155,11 @@ sub _table_uniq_info {
             push @cols, $self->_lc($idx_row->{name});
         }
         $get_idx_sth->finish;
+
+        # Rename because SQLite complains about sqlite_ prefixes on identifiers
+        # and ignores constraint names in DDL.
+        $name = (join '_', @cols) . '_unique';
+
         push @uniqs, [ $name => \@cols ];
     }
     $sth->finish;