X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FSybase.pm;h=6d163ec5f189e4f3158dba12a9bb7b75feb03a45;hb=8f65b7e515f165d4262550f025031e726f14844c;hp=145eef9d640a82e1ef871f394e5b70a7edcad578;hpb=243c6ebce7ae31cd4234b3125b177d4d0c86bcc7;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 145eef9..6d163ec 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm @@ -4,30 +4,33 @@ 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.05003'; +our $VERSION = '0.07002'; =head1 NAME -DBIx::Class::Schema::Loader::DBI::Sybase - DBIx::Class::Schema::Loader::DBI Sybase Implementation. +DBIx::Class::Schema::Loader::DBI::Sybase - DBIx::Class::Schema::Loader::DBI +Sybase ASE Implementation. -=head1 SYNOPSIS - - package My::Schema; - use base qw/DBIx::Class::Schema::Loader/; +=head1 DESCRIPTION - __PACKAGE__->loader_options( debug => 1 ); +See L and L. - 1; +=cut -=head1 DESCRIPTION +sub _setup { + my $self = shift; -See L. + $self->next::method(@_); -=cut + if (not defined $self->preserve_case) { + $self->preserve_case(1); + } -sub _is_case_sensitive { 1 } + $self->{db_schema} ||= + ($self->schema->storage->dbh->selectrow_array('select user_name()'))[0]; +} sub _rebless { my $self = shift; @@ -44,6 +47,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) = @_; @@ -187,9 +203,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,11 +247,11 @@ sub _columns_info_for { 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 +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 t ON c.type = t.type AND c.usertype = t.usertype +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' @@ -243,7 +261,7 @@ WHERE o.name = @{[ $dbh->quote($table) ]} AND o.type = 'U' my $info = $sth->fetchall_hashref('name'); while (my ($col, $res) = each %$result) { - my $data_type = $res->{data_type} = $info->{$col}{type}; + 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; @@ -253,6 +271,13 @@ WHERE o.name = @{[ $dbh->quote($table) ]} AND o.type = 'U' 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/; @@ -260,19 +285,35 @@ WHERE o.name = @{[ $dbh->quote($table) ]} AND o.type = 'U' } } -# 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) { + 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 =~ /^(?:numeric|decimal)\z/i) { - $res->{size} = [ $info->{$col}{prec}, $info->{$col}{scale} ]; + 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; @@ -295,6 +336,7 @@ sub _extra_column_info { =head1 SEE ALSO +L, L, L, L @@ -310,3 +352,4 @@ the same terms as Perl itself. =cut 1; +# vim:et sts=4 sw=4 tw=0: