X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FSybase.pm;h=d32a2ac6e537e6764e3aac64cd58d7734c493252;hb=659817cfc6f8f5dfa8dfcfa2992679d745294e3e;hp=c1cef54f18af6c9851bbd115fbd405e7c1c7f4bb;hpb=db4d62ad76d4158da4d2de5228f63435459c4509;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
index c1cef54..d32a2ac 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
@@ -4,37 +4,29 @@ use strict;
 use warnings;
 use base 'DBIx::Class::Schema::Loader::DBI::Sybase::Common';
 use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use mro 'c3';
 
-our $VERSION = '0.04999_14';
+our $VERSION = '0.07003';
 
 =head1 NAME
 
-DBIx::Class::Schema::Loader::DBI::Sybase - DBIx::Class::Schema::Loader::DBI Sybase Implementation.
-
-=head1 SYNOPSIS
-
-  package My::Schema;
-  use base qw/DBIx::Class::Schema::Loader/;
-
-  __PACKAGE__->loader_options( debug => 1 );
-
-  1;
+DBIx::Class::Schema::Loader::DBI::Sybase - DBIx::Class::Schema::Loader::DBI
+Sybase ASE Implementation.
 
 =head1 DESCRIPTION
 
-See L<DBIx::Class::Schema::Loader::Base>.
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base>.
 
 =cut
 
-sub _is_case_sensitive { 1 }
-
 sub _setup {
     my $self = shift;
 
     $self->next::method(@_);
-    $self->{db_schema} ||= $self->_build_db_schema;
-    $self->_set_quote_char_and_name_sep;
+
+    if (not defined $self->preserve_case) {
+        $self->preserve_case(1);
+    }
 }
 
 sub _rebless {
@@ -52,6 +44,19 @@ sub _rebless {
     }
 }
 
+sub _tables_list {
+    my ($self, $opts) = @_;
+
+    my $dbh = $self->schema->storage->dbh;
+
+    my $sth = $dbh->table_info(undef, $self->db_schema, undef, "'TABLE','VIEW'");
+
+    my @tables = grep $_ ne 'sysquerymetrics',
+              map $_->{table_name}, @{ $sth->fetchall_arrayref({ table_name => 1 }) };
+
+    return $self->_filter_tables(\@tables, $opts);
+}
+
 sub _table_columns {
     my ($self, $table) = @_;
 
@@ -195,9 +200,11 @@ sub _table_fk_info_builder {
 }
 
 sub _table_uniq_info {
+    no warnings 'uninitialized'; # for presumably XS weirdness with null operations
     my ($self, $table) = @_;
 
-    local $SIG{__WARN__} = sub {};
+    local $SIG{__WARN__} = sub { warn @_
+        unless $_[0] =~ /^Formula for Calculation:|^(?:--?|\+|=) Number of (?:self )?references|^Total Number of Referential Constraints|^Details:|^\s*$/ };
 
     my $dbh = $self->schema->storage->dbh;
     local $dbh->{FetchHashKeyName} = 'NAME_lc';
@@ -229,7 +236,7 @@ sub _table_uniq_info {
     return \@uniqs;
 }
 
-# set data_type to 'undef' for computed columns
+# get the correct data types, defaults and size
 sub _columns_info_for {
     my $self    = shift;
     my ($table) = @_;
@@ -237,29 +244,82 @@ sub _columns_info_for {
 
     my $dbh = $self->schema->storage->dbh;
     my $sth = $dbh->prepare(qq{
-SELECT c.name name, c.computedcol computedcol
+SELECT c.name name, bt.name base_type, ut.name user_type, cm.text deflt, c.prec prec, c.scale scale, c.length len
 FROM syscolumns c
 JOIN sysobjects o ON c.id = o.id
+LEFT JOIN systypes bt ON c.type     = bt.type 
+LEFT JOIN systypes ut ON c.usertype = ut.usertype
+LEFT JOIN syscomments cm
+    ON cm.id = CASE WHEN c.cdefault = 0 THEN c.computedcol ELSE c.cdefault END
 WHERE o.name = @{[ $dbh->quote($table) ]} AND o.type = 'U'
 });
     $sth->execute;
     local $dbh->{FetchHashKeyName} = 'NAME_lc';
-    my $computed_info = $sth->fetchall_hashref('name');
+    my $info = $sth->fetchall_hashref('name');
+
+    while (my ($col, $res) = each %$result) {
+        my $data_type = $res->{data_type} = $info->{$col}{user_type} || $info->{$col}{base_type};
+
+        if ($data_type && $data_type =~ /^timestamp\z/i) {
+            $res->{inflate_datetime} = 0;
+        }
 
-    for my $col (keys %$result) {
-        $result->{$col}{data_type} = undef
-            if $computed_info->{$col}{computedcol};
+        if (my $default = $info->{$col}{deflt}) {
+            if ($default =~ /^AS \s+ (\S+)/ix) {
+                my $function = $1;
+                $res->{default_value} = \$function;
+
+                if ($function =~ /^getdate\b/) {
+                    $res->{inflate_datetime} = 1;
+                }
+
+                delete $res->{size};
+                $res->{data_type} = undef;
+            }
+            elsif ($default =~ /^DEFAULT \s+ (\S+)/ix) {
+                my ($constant_default) = $1 =~ /^['"\[\]]?(.*?)['"\[\]]?\z/;
+                $res->{default_value} = $constant_default;
+            }
+        }
+
+        if (my $data_type = $res->{data_type}) {
+            if ($data_type eq 'int') {
+                $data_type = $res->{data_type} = 'integer';
+            }
+            elsif ($data_type eq 'decimal') {
+                $data_type = $res->{data_type} = 'numeric';
+            }
+
+            if ($data_type =~ /^(?:text|unitext|image|bigint|integer|smallint|tinyint|real|double|double precision|float|date|time|datetime|smalldatetime|money|smallmoney|timestamp|bit)\z/i) {
+                delete $res->{size};
+            }
+            elsif ($data_type eq 'numeric') {
+                my ($prec, $scale) = @{$info->{$col}}{qw/prec scale/};
+
+                if ($prec == 18 && $scale == 0) {
+                    delete $res->{size};
+                }
+                else {
+                    $res->{size} = [ $prec, $scale ];
+                }
+            }
+            elsif ($data_type =~ /^(?:unichar|univarchar)\z/i) {
+                $res->{size} /= 2;
+            }
+        }
+
+        if ($data_type eq 'float') {
+            $res->{data_type} = $info->{$col}{len} <= 4 ? 'real' : 'double precision';
+        }
     }
 
     return $result;
 }
 
 sub _extra_column_info {
-    my ($self, $info) = @_;
+    my ($self, $table, $column, $info, $dbi_info) = @_;
     my %extra_info;
 
-    my ($table, $column) = @$info{qw/TABLE_NAME COLUMN_NAME/};
-
     my $dbh = $self->schema->storage->dbh;
     my $sth = $dbh->prepare(qq{SELECT name FROM syscolumns WHERE id = (SELECT id FROM sysobjects WHERE name = @{[ $dbh->quote($table) ]}) AND (status & 0x80) = 0x80 AND name = @{[ $dbh->quote($column) ]}});
     $sth->execute();
@@ -273,6 +333,7 @@ sub _extra_column_info {
 
 =head1 SEE ALSO
 
+L<DBIx::Class::Schema::Loader::DBI::Sybase::Common>,
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
 L<DBIx::Class::Schema::Loader::DBI>
 
@@ -288,3 +349,4 @@ the same terms as Perl itself.
 =cut
 
 1;
+# vim:et sts=4 sw=4 tw=0: