X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FSQLite.pm;h=2f6be90486493819b2d0e06c2df85e93cdc25a3d;hb=306bf770bf08b06f92863808b1938f2fc704acb0;hp=3c2b3f3ae98f0691a4ce4f71f103c919c0640e4c;hpb=533d98c061845dd1d49e6ff94f7acee618b23764;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 3c2b3f3..2f6be90 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault';
 use mro 'c3';
 use DBIx::Class::Schema::Loader::Table ();
 
-our $VERSION = '0.07029';
+our $VERSION = '0.07047';
 
 =head1 NAME
 
@@ -63,7 +63,7 @@ sub _columns_info_for {
     local $self->dbh->{FetchHashKeyName} = 'NAME_lc';
 
     my $sth = $self->dbh->prepare(
-      "pragma table_info(" . $self->dbh->quote_identifier($table) . ")"
+        "pragma table_info(" . $self->dbh->quote_identifier($table) . ")"
     );
     $sth->execute;
     my $cols = $sth->fetchall_hashref('name');
@@ -81,12 +81,12 @@ sub _columns_info_for {
     # 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}) {
-        $num_pk++;
-        if (lc($cols{$col_name}{type}) eq 'integer') {
-          $pk_col = $col_name;
+        if ($cols{$col_name}{pk}) {
+            $num_pk++;
+            if (lc($cols{$col_name}{type}) eq 'integer') {
+                $pk_col = $col_name;
+            }
         }
-      }
     }
 
     while (my ($col, $info) = each %$result) {
@@ -94,7 +94,7 @@ sub _columns_info_for {
             ${ $info->{default_value} } = 'current_timestamp';
         }
         if ($num_pk == 1 and defined $pk_col and $pk_col eq $col) {
-          $info->{is_auto_increment} = 1;
+            $info->{is_auto_increment} = 1;
         }
     }
 
@@ -147,15 +147,15 @@ where name = ? and tbl_name = ?
 EOF
 
     foreach my $fk (@rels) {
-        my $local_cols  = '"?' . (join '"? \s* , \s* "?', @{ $fk->{local_columns} })        . '"?';
-        my $remote_cols = '"?' . (join '"? \s* , \s* "?', @{ $fk->{remote_columns} || [] }) . '"?';
+        my $local_cols  = '"?' . (join '"? \s* , \s* "?', map quotemeta, @{ $fk->{local_columns} })        . '"?';
+        my $remote_cols = '"?' . (join '"? \s* , \s* "?', map quotemeta, @{ $fk->{remote_columns} || [] }) . '"?';
         my ($deferrable_clause) = $ddl =~ /
                 foreign \s+ key \s* \( \s* $local_cols \s* \) \s* references \s* (?:\S+|".+?(?<!")") \s*
                 (?:\( \s* $remote_cols \s* \) \s*)?
                 (?:(?:
-                  on \s+ (?:delete|update) \s+ (?:set \s+ null|set \s+ default|cascade|restrict|no \s+ action)
+                    on \s+ (?:delete|update) \s+ (?:set \s+ null|set \s+ default|cascade|restrict|no \s+ action)
                 |
-                  match \s* (?:\S+|".+?(?<!")")
+                    match \s* (?:\S+|".+?(?<!")")
                 ) \s*)*
                 ((?:not)? \s* deferrable)?
         /sxi;
@@ -164,7 +164,33 @@ EOF
             $fk->{attrs}{is_deferrable} = $deferrable_clause =~ /not/i ? 0 : 1;
         }
         else {
-            $fk->{attrs}{is_deferrable} = 0;
+            # check for inline constraint if 1 local column
+            if (@{ $fk->{local_columns} } == 1) {
+                my ($local_col)  = @{ $fk->{local_columns} };
+                my ($remote_col) = @{ $fk->{remote_columns} || [] };
+                $remote_col ||= '';
+
+                my ($deferrable_clause) = $ddl =~ /
+                    "?\Q$local_col\E"? \s* (?:\w+\s*)* (?: \( \s* \d\+ (?:\s*,\s*\d+)* \s* \) )? \s*
+                    references \s+ (?:\S+|".+?(?<!")") (?:\s* \( \s* "?\Q$remote_col\E"? \s* \))? \s*
+                    (?:(?:
+                      on \s+ (?:delete|update) \s+ (?:set \s+ null|set \s+ default|cascade|restrict|no \s+ action)
+                    |
+                      match \s* (?:\S+|".+?(?<!")")
+                    ) \s*)*
+                    ((?:not)? \s* deferrable)?
+                /sxi;
+
+                if ($deferrable_clause) {
+                    $fk->{attrs}{is_deferrable} = $deferrable_clause =~ /not/i ? 0 : 1;
+                }
+                else {
+                    $fk->{attrs}{is_deferrable} = 0;
+                }
+            }
+            else {
+                $fk->{attrs}{is_deferrable} = 0;
+            }
         }
     }
 
@@ -200,11 +226,11 @@ sub _table_uniq_info {
         push @uniqs, [ $name => \@cols ];
     }
     $sth->finish;
-    return \@uniqs;
+    return [ sort { $a->[0] cmp $b->[0] } @uniqs ];
 }
 
 sub _tables_list {
-    my ($self, $opts) = @_;
+    my ($self) = @_;
 
     my $sth = $self->dbh->prepare("SELECT * FROM sqlite_master");
     $sth->execute;
@@ -222,7 +248,16 @@ sub _tables_list {
         );
     }
     $sth->finish;
-    return $self->_filter_tables(\@tables, $opts);
+    return $self->_filter_tables(\@tables);
+}
+
+sub _table_info_matches {
+    my ($self, $table, $info) = @_;
+
+    my $table_schema = $table->schema;
+    $table_schema = 'main' if !defined $table_schema;
+    return $info->{TABLE_SCHEM} eq $table_schema
+        && $info->{TABLE_NAME}  eq $table->name;
 }
 
 =head1 SEE ALSO
@@ -230,9 +265,9 @@ sub _tables_list {
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
 L<DBIx::Class::Schema::Loader::DBI>
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHORS>.
 
 =head1 LICENSE