schema-loader does multi-column FKs now, needs a bit of cleanup/refactor work

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / SQLite.pm

diff --git a/lib/DBIx/Class/Schema/Loader/SQLite.pm b/lib/DBIx/Class/Schema/Loader/SQLite.pm
index 70859dd..a8c675f 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/SQLite.pm
+++ b/lib/DBIx/Class/Schema/Loader/SQLite.pm
@@ -1,9 +1,8 @@
 package DBIx::Class::Schema::Loader::SQLite;
 
 use strict;
-use base 'DBIx::Class::Schema::Loader::Generic';
+use base qw/DBIx::Class::Schema::Loader::Generic/;
 use Text::Balanced qw( extract_bracketed );
-use DBI;
 use Carp;
 
 =head1 NAME
@@ -17,7 +16,6 @@ DBIx::Class::Schema::Loader::SQLite - DBIx::Class::Schema::Loader SQLite Impleme
   # $loader is a DBIx::Class::Schema::Loader::SQLite
   my $loader = DBIx::Class::Schema::Loader->new(
     dsn       => "dbi:SQLite:dbname=/path/to/dbfile",
-    namespace => "Data",
   );
 
 =head1 DESCRIPTION
@@ -30,11 +28,12 @@ sub _db_classes {
     return qw/DBIx::Class::PK::Auto::SQLite/;
 }
 
+# XXX this really needs a re-factor
 sub _relationships {
-    my $self = shift;
-    foreach my $table ( $self->tables ) {
+    my $class = shift;
+    foreach my $table ( $class->tables ) {
 
-        my $dbh = $self->{_storage}->dbh;
+        my $dbh = $class->storage->dbh;
         my $sth = $dbh->prepare(<<"");
 SELECT sql FROM sqlite_master WHERE tbl_name = ?
 
@@ -69,29 +68,39 @@ SELECT sql FROM sqlite_master WHERE tbl_name = ?
             # find multi-col fks below
             $col =~ s/\-\-comma\-\-/,/g;
 
-            # CDBI doesn't have built-in support multi-col fks, so ignore them
-            next if $col =~ s/^\s*FOREIGN\s+KEY\s*//i && $col =~ /^\([^,)]+,/;
+            $col =~ s/^\s*FOREIGN\s+KEY\s*//i;
 
             # Strip punctuations around key and table names
-            $col =~ s/[()\[\]'"]/ /g;
+            $col =~ s/[\[\]'"]/ /g;
             $col =~ s/^\s+//gs;
 
             # Grab reference
-            if ( $col =~ /^(\w+).*REFERENCES\s+(\w+)\s*(\w+)?/i ) {
+            if ( $col =~ /^\((.*)\)\s+REFERENCES\s+(\w+)\s*\((.*)\)/i ) {
                 chomp $col;
-                warn qq/\# Found foreign key definition "$col"\n\n/
-                  if $self->debug;
-                eval { $self->_belongs_to_many( $table, $1, $2, $3 ) };
+
+                my ($cols, $f_table, $f_cols) = ($1, $2, $3);
+                my @cols = map { s/\s*//g; $_ } split(/\s*,\s*/,$cols);
+                my @f_cols = map { s/\s*//g; $_ } split(/\s*,\s*/,$f_cols);
+
+                die "Mismatched column count in rel for $table => $f_table"
+                  if @cols != @f_cols;
+            
+                my $cond = {};
+                for(my $i = 0 ; $i < @cols; $i++) {
+                    $cond->{$f_cols[$i]} = $cols[$i];
+                }
+
+                eval { $class->_belongs_to_many( $table, $f_table, $cond ) };
                 warn qq/\# belongs_to_many failed "$@"\n\n/
-                  if $@ && $self->debug;
+                  if $@ && $class->debug_loader;
             }
         }
     }
 }
 
 sub _tables {
-    my $self = shift;
-    my $dbh = $self->{_storage}->dbh;
+    my $class = shift;
+    my $dbh = $class->storage->dbh;
     my $sth  = $dbh->prepare("SELECT * FROM sqlite_master");
     $sth->execute;
     my @tables;
@@ -103,10 +112,10 @@ sub _tables {
 }
 
 sub _table_info {
-    my ( $self, $table ) = @_;
+    my ( $class, $table ) = @_;
 
     # find all columns.
-    my $dbh = $self->{_storage}->dbh;
+    my $dbh = $class->storage->dbh;
     my $sth = $dbh->prepare("PRAGMA table_info('$table')");
     $sth->execute();
     my @columns;
@@ -134,7 +143,7 @@ SQL
         @pks = ($primary);
     }
     else {
-        my ($pks) = $sql =~ m/PRIMARY\s+KEY\s*\(\s*([^)]+)\s*\)/;
+        my ($pks) = $sql =~ m/PRIMARY\s+KEY\s*\(\s*([^)]+)\s*\)/i;
         @pks = split( m/\s*\,\s*/, $pks ) if $pks;
     }
     return ( \@columns, \@pks );