X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FDDL%2FSQLite.pm;h=c5406c5b8883f74eabf54ef93e827dd797e82fd1;hb=7f897a63d37d3096c6535a2417aefe599057400f;hp=69dd24e4ae66d2108633642aa9c29b08c65d3645;hpb=859b70aaf6d8be8fb26045d016e59b1fc8d23e08;p=dbsrgits%2FSQL-Translator-2.0-ish.git

diff --git a/lib/SQL/Translator/Parser/DDL/SQLite.pm b/lib/SQL/Translator/Parser/DDL/SQLite.pm
index 69dd24e..c5406c5 100644
--- a/lib/SQL/Translator/Parser/DDL/SQLite.pm
+++ b/lib/SQL/Translator/Parser/DDL/SQLite.pm
@@ -2,6 +2,7 @@ use MooseX::Declare;
 role SQL::Translator::Parser::DDL::SQLite {
     use MooseX::Types::Moose qw(Str);
     use MooseX::MultiMethods;
+    use Moose::Autobox;
     use SQL::Translator::Constants qw(:sqlt_types :sqlt_constants);
     use SQL::Translator::Types qw(Schema);
     use aliased 'SQL::Translator::Object::Column';
@@ -36,57 +37,59 @@ role SQL::Translator::Parser::DDL::SQLite {
     
         my $schema = $translator->schema;
         my @tables = 
-            map   { $_->[1] }
-            sort  { $a->[0] <=> $b->[0] }
-            map   { [ $result->{'tables'}{ $_ }->{'order'}, $_ ] }
-            keys %{ $result->{'tables'} };
-    
+            sort  { $result->{tables}{$a}{order} <=> $result->{tables}{$b}{order} }
+            keys %{ $result->{tables} };
+
         for my $table_name ( @tables ) {
-            my $tdata =  $result->{'tables'}{ $table_name };
-            my $table = Table->new({ name  => $tdata->{'name'}, schema => $schema });
-            $table->comments( $tdata->{'comments'} );
+            my $tdata = $result->{tables}{ $table_name };
+            my $table = Table->new({ name => $tdata->{name}, schema => $schema });
+            $table->comments( $tdata->{comments}->flatten ) if $tdata->{comments};
             $schema->add_table($table);
     
-            for my $fdata ( @{ $tdata->{'fields'} } ) {
+            for my $fdata ( @{ $tdata->{fields} } ) {
                 my $field = Column->new({
-                    name              => $fdata->{'name'},
-                    data_type         => $fdata->{'data_type'},
+                    name              => $fdata->{name},
+                    data_type         => $fdata->{data_type},
                     sql_data_type     => $self->data_type_mapping->{$fdata->{data_type}} || -999999,
-                    size              => $fdata->{'size'},
-                    default_value     => $fdata->{'default'},
-                    is_auto_increment => $fdata->{'is_auto_inc'},
-                    is_nullable       => $fdata->{'is_nullable'},
-                    comments          => $fdata->{'comments'},
+                    size              => $fdata->{size},
+                    default_value     => $fdata->{default},
+                    is_auto_increment => $fdata->{is_auto_inc},
+                    is_nullable       => $fdata->{is_primary_key} ? 0 : $fdata->{is_nullable},
+                    comments          => $fdata->{comments},
                     table             => $table,
                 });
+
                 $table->add_column($field);
-    
-                $table->primary_key( $field->name ) if $fdata->{'is_primary_key'};
-    
-                for my $cdata ( @{ $fdata->{'constraints'} } ) {
-                    next unless $cdata->{'type'} eq 'foreign_key';
-                    $cdata->{'fields'} ||= [ $field->name ];
-                    push @{ $tdata->{'constraints'} }, $cdata;
+                $table->primary_key( $field->name ) if $fdata->{is_primary_key};
+
+                for my $cdata ( @{ $fdata->{constraints} } ) {
+                    next unless $cdata->{type} eq 'foreign_key';
+                    $cdata->{fields} ||= [ $field->name ];
+                    push @{ $tdata->{constraints} }, $cdata;
                 }
             }
     
-            for my $idata ( @{ $tdata->{'indices'} || [] } ) {
+            for my $idata ( @{ $tdata->{indices} || [] } ) {
                 my @columns = delete $idata->{fields};
                 my $index = Index->new({
-                    name    => $idata->{'name'},
-                    type    => uc $idata->{'type'},
+                    name    => $idata->{name},
+                    type    => uc $idata->{type},
                     table   => $table,
                 });
                 $index->add_column($table->get_column(@$_[0])) for @columns;
                 $table->add_index($index);
             }
     
-            for my $cdata ( @{ $tdata->{'constraints'} || [] } ) {
+            for my $cdata ( @{ $tdata->{constraints} || [] } ) {
                 my $constraint;
                 if (uc $cdata->{type} eq 'PRIMARY_KEY') {
                     $constraint = PrimaryKey->new({ name => $cdata->{name} || 'primary_key', table => $table });
-                    $constraint->add_column($table->get_column($_)) for @{$cdata->{fields}};
-                $table->get_column($_)->is_primary_key(1) for @{$cdata->{fields}};
+
+                    for my $field (@{$cdata->{fields}}) {
+                        $table->get_column($field)->is_primary_key(1);
+                        $table->get_column($field)->is_nullable(0);
+                        $constraint->add_column($table->get_column($field));
+                    }
                 } elsif (uc $cdata->{type} eq 'FOREIGN_KEY') {
                     $constraint = ForeignKey->new({ name => $cdata->{name} || 'foreign_key',
                                                     table => $table,
@@ -94,45 +97,39 @@ role SQL::Translator::Parser::DDL::SQLite {
                                                     reference_columns => ref $cdata->{reference_fields} ? $cdata->{reference_fields} : [ $cdata->{reference_fields} ],
                                                     on_delete => $cdata->{on_delete} || $cdata->{on_delete_do},
                                                     on_update => $cdata->{on_update} || $cdata->{on_update_do} });
-                    $table->get_column($_)->is_foreign_key(1) for @{$cdata->{fields}};
-                    $table->get_column($_)->foreign_key_reference($constraint) for @{$cdata->{fields}};
+                    for my $field (@{$cdata->{fields}}) {
+                        $table->get_column($field)->is_foreign_key(1);
+                        $table->get_column($field)->foreign_key_reference($constraint);
+                        $constraint->add_column($table->get_column($field));
+                    }
                 } else {
                     $constraint = Constraint->new({ name => $cdata->{name} || 'constraint', type => uc $cdata->{type}, table => $table });
+                    if (uc $cdata->{type} eq 'UNIQUE') {
+                        $table->get_column($_)->is_unique(1) for @{$cdata->{fields}};
+                    }
                     $constraint->add_column($table->get_column($_)) for @{$cdata->{fields}};
                 }
+  
                 $table->add_constraint($constraint);
-=cut
-                my $constraint = Constraint->new({
-                    name             => $cdata->{'name'},
-                    type             => $cdata->{'type'},
-                    columns          => $cdata->{'fields'},
-                    reference_table  => $cdata->{'reference_table'},
-                    reference_fields => $cdata->{'reference_fields'},
-                    match_type       => $cdata->{'match_type'} || '',
-                    on_delete        => $cdata->{'on_delete'} || $cdata->{'on_delete_do'},
-                    on_update        => $cdata->{'on_update'} || $cdata->{'on_update_do'},
-                    table            => $table,
-                });
-                $table->add_constraint($constraint);
-=cut
             }
         }
     
-        for my $def ( @{ $result->{'views'} || [] } ) {
+        for my $def ( @{ $result->{views} || [] } ) {
             my $view = View->new({
-                name  => $def->{'name'},
-                sql   => $def->{'sql'},
+                name   => $def->{name},
+                fields => $def->{fields},
+                sql    => $def->{sql},
             });
             $schema->add_view($view);
         }
     
-        for my $def ( @{ $result->{'triggers'} || [] } ) {
+        for my $def ( @{ $result->{triggers} || [] } ) {
             my $trigger = Trigger->new({
-                name                => $def->{'name'},
-                perform_action_when => $def->{'when'},
-                database_events     => $def->{'db_events'},
-                action              => $def->{'action'},
-                on_table            => $def->{'on_table'},
+                name                => $def->{name},
+                perform_action_when => $def->{when},
+                database_events     => $def->{db_events},
+                action              => $def->{action},
+                on_table            => $def->{on_table},
             });
             $schema->add_trigger($trigger);
         }