upload 0.05001

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / DBI / Sybase.pm

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
index aaf6970..56b0a35 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
@@ -2,14 +2,11 @@ package DBIx::Class::Schema::Loader::DBI::Sybase;
 
 use strict;
 use warnings;
-use base qw/
-    DBIx::Class::Schema::Loader::DBI
-    DBIx::Class::Schema::Loader::DBI::Sybase::Common
-/;
+use base 'DBIx::Class::Schema::Loader::DBI::Sybase::Common';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.04999_11';
+our $VERSION = '0.05001';
 
 =head1 NAME
 
@@ -59,7 +56,12 @@ sub _table_columns {
     my ($self, $table) = @_;
 
     my $dbh = $self->schema->storage->dbh;
-    my $columns = $dbh->selectcol_arrayref(qq{SELECT name FROM syscolumns WHERE id = (SELECT id FROM sysobjects WHERE name = @{[ $dbh->quote($table) ]} AND type = 'U')});
+    my $columns = $dbh->selectcol_arrayref(qq{
+SELECT c.name
+FROM syscolumns c JOIN sysobjects o
+ON c.id = o.id
+WHERE o.name = @{[ $dbh->quote($table) ]} AND o.type = 'U'
+});
 
     return $columns;
 }
@@ -227,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;
@@ -251,7 +310,7 @@ L<DBIx::Class::Schema::Loader::DBI>
 
 =head1 AUTHOR
 
-See L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
 
 =head1 LICENSE