SQLite DDL parser test & data

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

diff --git a/lib/SQL/Translator/Parser/DBI.pm b/lib/SQL/Translator/Parser/DBI.pm
index 8372ccf..42550d0 100644 (file)
--- a/lib/SQL/Translator/Parser/DBI.pm
+++ b/lib/SQL/Translator/Parser/DBI.pm
@@ -43,7 +43,7 @@ role SQL::Translator::Parser::DBI {
         default => undef
     );
 
-     method _subclass {
+    method _subclass {
         my $dbtype = $self->dbh->get_info($GetInfoType{SQL_DBMS_NAME}) || $self->dbh->{Driver}{Name};
 
         my $class = __PACKAGE__ . '::'. $dbtype;
@@ -51,16 +51,18 @@ role SQL::Translator::Parser::DBI {
         $class->meta->apply($self);
     }
 
-    method _is_auto_increment { 0 }
+    method _is_auto_increment(HashRef $column_info) { 0 }
 
-    method _column_default_value(HashRef $column_info) { return $column_info->{COLUMN_DEF}; }
+    method _column_default_value(HashRef $column_info) { $column_info->{COLUMN_DEF} }
+
+    method _column_data_type(HashRef $column_info) { $column_info->{DATA_TYPE} }
 
     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) {
             if ($table_info->{TABLE_TYPE} =~ /^(TABLE|LOCAL TEMPORARY|GLOBAL TEMPORARY)$/) {
                 my $temp = $table_info->{TABLE_TYPE} =~ /TEMPORARY$/ ? 1 : 0;
-                my $table = SQL::Translator::Object::Table->new({ name => $table_info->{TABLE_NAME}, temporary => $temp });
+                my $table = SQL::Translator::Object::Table->new({ name => $table_info->{TABLE_NAME}, temporary => $temp, schema => $schema });
                 $schema->add_table($table);
 
                 $self->_add_columns($table);
@@ -81,7 +83,7 @@ role SQL::Translator::Parser::DBI {
         my $sth = $self->dbh->column_info($self->catalog_name, $self->schema_name, $table->name, '%');
         while (my $column_info = $sth->fetchrow_hashref) {
             my $column = SQL::Translator::Object::Column->new({ name => $column_info->{COLUMN_NAME},
-                                                                data_type => $column_info->{DATA_TYPE},
+                                                                data_type => $self->_column_data_type($column_info),
                                                                 size => $column_info->{COLUMN_SIZE},
                                                                 default_value => $self->_column_default_value($column_info),
                                                                 is_auto_increment => $self->_is_auto_increment($column_info),
@@ -129,6 +131,8 @@ role SQL::Translator::Parser::DBI {
     method _add_indexes(Table $table) {
         my $index_info = $self->dbh->statistics_info($self->catalog_name, $self->schema_name, $table->name, 1, 0);
 
+        return unless defined $index_info;
+
         my ($index_name, $index_type, @index_cols);
         while (my $index_col = $index_info->fetchrow_hashref) {
             $index_name = $index_col->{INDEX_NAME};