fix for storing comments using Moose::Autobox and ->flatten

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator / Parser / DDL / SQLite.pm

diff --git a/lib/SQL/Translator/Parser/DDL/SQLite.pm b/lib/SQL/Translator/Parser/DDL/SQLite.pm
index 26db707..b052dd8 100644 (file)
--- 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';
@@ -28,7 +29,7 @@ role SQL::Translator::Parser::DDL::SQLite {
     
         unless (defined $parser) {
             return $translator->error("Error instantiating Parse::RecDescent ".
-                "instance: Bad grammer");
+                "instance: Bad grammar");
         }
     
         my $result = $parser->startrule($data);
@@ -37,14 +38,14 @@ role SQL::Translator::Parser::DDL::SQLite {
         my $schema = $translator->schema;
         my @tables = 
             map   { $_->[1] }
-#            sort  { $a->[0] <=> $b->[0] } 
+            sort  { $a->[0] <=> $b->[0] }
             map   { [ $result->{'tables'}{ $_ }->{'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'} );
+            $table->comments( $tdata->{'comments'}->flatten ) if $tdata->{comments};
             $schema->add_table($table);
     
             for my $fdata ( @{ $tdata->{'fields'} } ) {
@@ -56,7 +57,6 @@ role SQL::Translator::Parser::DDL::SQLite {
                     default_value     => $fdata->{'default'},
                     is_auto_increment => $fdata->{'is_auto_inc'},
                     is_nullable       => $fdata->{'is_nullable'},
-                    comments          => $fdata->{'comments'},
                     table             => $table,
                 });
                 $table->add_column($field);
@@ -91,7 +91,7 @@ role SQL::Translator::Parser::DDL::SQLite {
                     $constraint = ForeignKey->new({ name => $cdata->{name} || 'foreign_key',
                                                     table => $table,
                                                     reference_table => $cdata->{reference_table},
-                                                    reference_columns => $cdata->{reference_fields},
+                                                    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}};
@@ -101,20 +101,6 @@ role SQL::Translator::Parser::DDL::SQLite {
                     $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
             }
         }