X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FSybase.pm;h=f980c00adb9d125614e7fffda905197291e0cc34;hb=refs%2Ftags%2F0.05003;hp=e6643d6da8a8c469612367095d3a8b8a7e11f3a8;hpb=de82711a0abb69a8f67fc81e5e27f627d7053bf2;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 e6643d6..f980c00 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI::Sybase::Common';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.04999_14';
+our $VERSION = '0.05003';
 
 =head1 NAME
 
@@ -229,6 +229,63 @@ sub _table_uniq_info {
     return \@uniqs;
 }
 
+# get the correct data types, defaults and size
+sub _columns_info_for {
+    my $self    = shift;
+    my ($table) = @_;
+    my $result  = $self->next::method(@_);
+
+    my $dbh = $self->schema->storage->dbh;
+    my $sth = $dbh->prepare(qq{
+SELECT c.name name, t.name 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 t ON c.type = t.type AND c.usertype = t.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 $info = $sth->fetchall_hashref('name');
+
+    while (my ($col, $res) = each %$result) {
+        my $data_type = $res->{data_type} = $info->{$col}{type};
+
+        if ($data_type && $data_type =~ /^timestamp\z/i) {
+            $res->{inflate_datetime} = 0;
+        }
+
+        if (my $default = $info->{$col}{deflt}) {
+            if ($default =~ /^AS \s+ (\S+)/ix) {
+                my $function = $1;
+                $res->{default_value} = \$function;
+            }
+            elsif ($default =~ /^DEFAULT \s+ (\S+)/ix) {
+                my ($constant_default) = $1 =~ /^['"\[\]]?(.*?)['"\[\]]?\z/;
+                $res->{default_value} = $constant_default;
+            }
+        }
+
+# XXX we need to handle "binary precision" for FLOAT(X)
+# (see: http://msdn.microsoft.com/en-us/library/aa258876(SQL.80).aspx )
+        if (my $data_type = $res->{data_type}) {
+            if ($data_type =~ /^(?:text|unitext|image|bigint|int|integer|smallint|tinyint|real|double|double precision|float|date|time|datetime|smalldatetime|money|smallmoney|timestamp|bit)\z/i) {
+                delete $res->{size};
+            }
+            elsif ($data_type =~ /^(?:numeric|decimal)\z/i) {
+                $res->{size} = [ $info->{$col}{prec}, $info->{$col}{scale} ];
+            }
+            elsif ($data_type =~ /^(?:unichar|univarchar)\z/i) {
+                $res->{size} /= 2;
+            }
+        }
+    }
+
+    return $result;
+}
+
 sub _extra_column_info {
     my ($self, $info) = @_;
     my %extra_info;