X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FDBI.pm;h=1eadf91fa22276c0347b8d7a91e8971a20a1c8b5;hb=9406163a509d724abed9296f21ca9e4d7d770267;hp=42550d0ebde4a7022d80eeb5e2f1785b7e8f9ad0;hpb=d1f9323ac102d79e9387e9ad895a63b69b4433ba;p=dbsrgits%2FSQL-Translator-2.0-ish.git

diff --git a/lib/SQL/Translator/Parser/DBI.pm b/lib/SQL/Translator/Parser/DBI.pm
index 42550d0..1eadf91 100644
--- a/lib/SQL/Translator/Parser/DBI.pm
+++ b/lib/SQL/Translator/Parser/DBI.pm
@@ -5,6 +5,7 @@ role SQL::Translator::Parser::DBI {
     use DBI::Const::GetInfoReturn;
 
     use MooseX::Types::Moose qw(HashRef Maybe Str);
+    use MooseX::MultiMethods;
 
     use SQL::Translator::Object::Column;
     use SQL::Translator::Object::ForeignKey;
@@ -13,7 +14,7 @@ role SQL::Translator::Parser::DBI {
     use SQL::Translator::Object::Table;
     use SQL::Translator::Object::View;
 
-    use SQL::Translator::Types qw(Schema Table);
+    use SQL::Translator::Types qw(Schema Table Column);
 
     has 'quoter' => (
         is => 'rw',
@@ -57,6 +58,8 @@ role SQL::Translator::Parser::DBI {
 
     method _column_data_type(HashRef $column_info) { $column_info->{DATA_TYPE} }
 
+    method _add_column_extra(Column $column, HashRef $column_info) { return }
+
     method _add_tables(Schema $schema) {
         my $sth = $self->dbh->table_info($self->catalog_name, $self->schema_name, '%', "TABLE,VIEW,'LOCAL TEMPORARY','GLOBAL TEMPORARY'");
         while (my $table_info = $sth->fetchrow_hashref) {
@@ -81,6 +84,7 @@ role SQL::Translator::Parser::DBI {
 
     method _add_columns(Table $table) {
         my $sth = $self->dbh->column_info($self->catalog_name, $self->schema_name, $table->name, '%');
+        my @columns;
         while (my $column_info = $sth->fetchrow_hashref) {
             my $column = SQL::Translator::Object::Column->new({ name => $column_info->{COLUMN_NAME},
                                                                 data_type => $self->_column_data_type($column_info),
@@ -89,8 +93,10 @@ role SQL::Translator::Parser::DBI {
                                                                 is_auto_increment => $self->_is_auto_increment($column_info),
                                                                 is_nullable => $column_info->{NULLABLE},
                                                               });
-            $table->add_column($column);
+            $self->_add_column_extra($column, $column_info);
+            push @columns, { column => $column, pos =>  $column_info->{ORDINAL_POSITION} || $#columns };
         }
+        $table->add_column($_->{column}) for sort { $a->{pos} <=> $b->{pos} } @columns;
     }
 
     method _add_primary_key(Table $table) {
@@ -144,4 +150,10 @@ role SQL::Translator::Parser::DBI {
         $index->add_column($table->get_column($_)) for @index_cols;
         $table->add_index($index);
     }
+
+    multi method parse(Schema $data) { $data }
+
+    multi method parse(Any $) {
+        $self->_add_tables($self->schema);
+    }
 }