X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FInterBase.pm;h=19f332f4b6e574a8dfb8c1314aae15f9d083d90d;hb=8ec0dd691ba3dfebbc9642e56e0157ea3d5408f3;hp=c8c2fa66e8dfc4ad42cd18cf3281d9bb39bb588c;hpb=ffb03c967a65fa81a79b95d987e63dffd1ed6375;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm b/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
index c8c2fa6..19f332f 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
@@ -8,7 +8,7 @@ use base qw/DBIx::Class::Schema::Loader::DBI/;
 use Carp::Clan qw/^DBIx::Class/;
 use List::Util 'first';
 
-our $VERSION = '0.05003';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
@@ -17,17 +17,60 @@ Firebird Implementation.
 
 =head1 DESCRIPTION
 
-See L<DBIx::Class::Schema::Loader::Base> for available options.
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base>.
 
-=cut
+=head1 COLUMN NAME CASE ISSUES
+
+By default column names from unquoted DDL will be generated in uppercase, as
+that is the only way they will work with quoting on.
+
+See the L<preserve_case|DBIx::Class::Schema::Loader::Base/preserve_case> option
+to false if you would like to have lowercase column names.
+
+Setting this option is a good idea if your DDL uses unquoted identifiers and
+you will not use quoting (the
+L<quote_char|DBIx::Class::Storage::DBI/quote_char> option in
+L<connect_info|DBIx::Class::Storage::DBI/connect_info>.)
+
+Be careful to also not use any SQL reserved words in your DDL.
+
+This will generate lowercase column names (as opposed to the actual uppercase
+names) in your Result classes that will only work with quoting off.
 
-sub _is_case_sensitive { 1 }
+Mixed-case table and column names will be ignored when this option is on and
+will not work with quoting turned off.
+
+B<NOTE:> This option used to be called C<unquoted_ddl> but has been removed in
+favor of the more generic option.
+
+=cut
 
 sub _setup {
     my $self = shift;
 
-    $self->schema->storage->sql_maker->quote_char('"');
+    $self->next::method(@_);
+
+    if (not defined $self->preserve_case) {
+        warn <<'EOF';
+
+WARNING: Assuming mixed-case Firebird DDL, see
+perldoc DBIx::Class::Schema::Loader::DBI::InterBase
+and the 'preserve_case' option in
+perldoc DBIx::Class::Schema::Loader::Base
+for more information.
+
+EOF
+        $self->preserve_case(1);
+    }
+
     $self->schema->storage->sql_maker->name_sep('.');
+
+    if ($self->preserve_case) {
+        $self->schema->storage->sql_maker->quote_char('"');
+    }
+    else {
+        $self->schema->storage->sql_maker->quote_char(undef);
+    }
 }
 
 sub _table_pk_info {
@@ -48,7 +91,7 @@ EOF
     while (my ($col) = $sth->fetchrow_array) {
         s/^\s+//, s/\s+\z// for $col;
 
-        push @keydata, $col;
+        push @keydata, $self->_lc($col);
     }
 
     return \@keydata;
@@ -74,8 +117,8 @@ EOF
     while (my ($fk, $local_col, $remote_tab, $remote_col) = $sth->fetchrow_array) {
         s/^\s+//, s/\s+\z// for $fk, $local_col, $remote_tab, $remote_col;
 
-        push @{$local_cols->{$fk}},  $local_col;
-        push @{$remote_cols->{$fk}}, $remote_col;
+        push @{$local_cols->{$fk}},  $self->_lc($local_col);
+        push @{$remote_cols->{$fk}}, $self->_lc($remote_col);
         $remote_table->{$fk} = $remote_tab;
     }
 
@@ -106,75 +149,153 @@ EOF
     while (my ($constraint_name, $column) = $sth->fetchrow_array) {
         s/^\s+//, s/\s+\z// for $constraint_name, $column;
 
-        push @{$constraints->{$constraint_name}}, $column;
+        push @{$constraints->{$constraint_name}}, $self->_lc($column);
     }
 
     my @uniqs = map { [ $_ => $constraints->{$_} ] } keys %$constraints;
     return \@uniqs;
 }
 
-sub _extra_column_info {
-    my ($self, $table, $column, $info, $dbi_info) = @_;
-    my %extra_info;
+sub _columns_info_for {
+    my $self = shift;
+    my ($table) = @_;
+
+    my $result = $self->next::method(@_);
 
     my $dbh = $self->schema->storage->dbh;
 
     local $dbh->{LongReadLen} = 100000;
     local $dbh->{LongTruncOk} = 1;
 
-    my $sth = $dbh->prepare(<<'EOF');
+    while (my ($column, $info) = each %$result) {
+        my $sth = $dbh->prepare(<<'EOF');
 SELECT t.rdb$trigger_source
 FROM rdb$triggers t
 WHERE t.rdb$relation_name = ?
 AND t.rdb$system_flag = 0 -- user defined
 AND t.rdb$trigger_type = 1 -- BEFORE INSERT
 EOF
-    $sth->execute($table);
+        $sth->execute($table);
 
-    while (my ($trigger) = $sth->fetchrow_array) {
-        my @trig_cols = map {
-            /^"([^"]+)/ ? $1 : uc($1)
-        } $trigger =~ /new\.("?\w+"?)/ig;
+        while (my ($trigger) = $sth->fetchrow_array) {
+            my @trig_cols = map { /^"([^"]+)/ ? $1 : uc($_) } $trigger =~ /new\.("?\w+"?)/ig;
 
-        my ($quoted, $generator) = $trigger =~
-/(?:gen_id\s* \( \s* |next \s* value \s* for \s*)(")?(\w+)/ix;
+            my ($quoted, $generator) = $trigger =~ /(?:gen_id\s* \( \s* |next \s* value \s* for \s*)(")?(\w+)/ix;
 
-        $generator = uc $generator unless $quoted;
+            if ($generator) {
+                $generator = uc $generator unless $quoted;
 
-        if ((first { $_ eq $column } @trig_cols) && $generator) {
-            $extra_info{is_auto_increment} = 1;
-            $extra_info{sequence}          = $generator;
+                if (first { $self->_uc($_) eq $self->_uc($column) } @trig_cols) {
+                    $info->{is_auto_increment} = 1;
+                    $info->{sequence}          = $generator;
+                    last;
+                }
+            }
         }
-    }
 
-# fix up DT types, no idea which other types are fucked
-    if ($info->{data_type} eq '11') {
-        $extra_info{data_type} = 'TIMESTAMP';
-    }
-    elsif ($info->{data_type} eq '9') {
-        $extra_info{data_type} = 'DATE';
-    }
+# fix up types
+        $sth = $dbh->prepare(<<'EOF');
+SELECT f.rdb$field_precision, f.rdb$field_scale, f.rdb$field_type, f.rdb$field_sub_type, t.rdb$type_name, st.rdb$type_name
+FROM rdb$fields f
+JOIN rdb$relation_fields rf ON rf.rdb$field_source = f.rdb$field_name
+LEFT JOIN rdb$types t  ON f.rdb$field_type     = t.rdb$type  AND t.rdb$field_name  = 'RDB$FIELD_TYPE'
+LEFT JOIN rdb$types st ON f.rdb$field_sub_type = st.rdb$type AND st.rdb$field_name = 'RDB$FIELD_SUB_TYPE'
+WHERE rf.rdb$relation_name = ?
+    AND rf.rdb$field_name  = ?
+EOF
+        $sth->execute($table, $self->_uc($column));
+        my ($precision, $scale, $type_num, $sub_type_num, $type_name, $sub_type_name) = $sth->fetchrow_array;
+        $scale = -$scale if $scale && $scale < 0;
+
+        if ($type_name && $sub_type_name) {
+            s/\s+\z// for $type_name, $sub_type_name;
+
+            # fixups primarily for DBD::InterBase
+            if ($info->{data_type} =~ /^(?:integer|int|smallint|bigint|-9581)\z/) {
+                if ($precision && $type_name =~ /^(?:LONG|INT64)\z/ && $sub_type_name eq 'BLR') {
+                    $info->{data_type} = 'decimal';
+                }
+                elsif ($precision && $type_name =~ /^(?:LONG|SHORT|INT64)\z/ && $sub_type_name eq 'TEXT') {
+                    $info->{data_type} = 'numeric';
+                }
+                elsif ((not $precision) && $type_name eq 'INT64' && $sub_type_name eq 'BINARY') {
+                    $info->{data_type} = 'bigint';
+                }
+            }
+            # ODBC makes regular blobs sub_type blr
+            elsif ($type_name eq 'BLOB') {
+                if ($sub_type_name eq 'BINARY') {
+                    $info->{data_type} = 'blob';
+                }
+                elsif ($sub_type_name eq 'TEXT') {
+                    $info->{data_type} = 'blob sub_type text';
+                }
+            }
+        }
+
+        if ($info->{data_type} =~ /^(?:decimal|numeric)\z/ && defined $precision && defined $scale) {
+            if ($precision == 9 && $scale == 0) {
+                delete $info->{size};
+            }
+            else {
+                $info->{size} = [$precision, $scale];
+            }
+        }
+
+        if ($info->{data_type} eq '11') {
+            $info->{data_type} = 'timestamp';
+        }
+        elsif ($info->{data_type} eq '10') {
+            $info->{data_type} = 'time';
+        }
+        elsif ($info->{data_type} eq '9') {
+            $info->{data_type} = 'date';
+        }
+        elsif ($info->{data_type} eq 'character varying') {
+            $info->{data_type} = 'varchar';
+        }
+        elsif ($info->{data_type} eq 'character') {
+            $info->{data_type} = 'char';
+        }
+        elsif ($info->{data_type} eq 'int64' || $info->{data_type} eq '-9581') {
+            # the constant is just in case, the query should pick up the type
+            $info->{data_type} = 'bigint';
+        }
+
+        # DBD::InterBase sets scale to '0' for some reason for char types
+        if ($info->{data_type} =~ /^(?:char|varchar)\z/ && ref($info->{size}) eq 'ARRAY') {
+            $info->{size} = $info->{size}[0];
+        }
+        elsif ($info->{data_type} !~ /^(?:char|varchar|numeric|decimal)\z/) {
+            delete $info->{size};
+        }
 
 # get default
-    $sth = $dbh->prepare(<<'EOF');
+        delete $info->{default_value} if $info->{default_value} && $info->{default_value} eq 'NULL';
+
+        $sth = $dbh->prepare(<<'EOF');
 SELECT rf.rdb$default_source
 FROM rdb$relation_fields rf
 WHERE rf.rdb$relation_name = ?
 AND rf.rdb$field_name = ?
 EOF
-    $sth->execute($table, $column);
-    my ($default_src) = $sth->fetchrow_array;
-
-    if ($default_src && (my ($def) = $default_src =~ /^DEFAULT \s+ (\S+)/ix)) {
-        if (my ($quoted) = $def =~ /^'(.*?)'\z/) {
-            $extra_info{default_value} = $quoted;
-        }
-        else {
-            $extra_info{default_value} = $def =~ /^\d/ ? $def : \$def;
+        $sth->execute($table, $self->_uc($column));
+        my ($default_src) = $sth->fetchrow_array;
+
+        if ($default_src && (my ($def) = $default_src =~ /^DEFAULT \s+ (\S+)/ix)) {
+            if (my ($quoted) = $def =~ /^'(.*?)'\z/) {
+                $info->{default_value} = $quoted;
+            }
+            else {
+                $info->{default_value} = $def =~ /^\d/ ? $def : \$def;
+            }
         }
+
+        ${ $info->{default_value} } = 'current_timestamp'
+            if ref $info->{default_value} && ${ $info->{default_value} } eq 'CURRENT_TIMESTAMP';
     }
 
-    return \%extra_info;
+    return $result;
 }
 
 =head1 SEE ALSO
@@ -194,3 +315,4 @@ the same terms as Perl itself.
 =cut
 
 1;
+# vim:et sw=4 sts=4 tw=0: