X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FSybase.pm;h=3d48a83e32e1abe2a986e519f99855a39ba8cdc2;hb=a47e6e743dfce14a61c2f2c4d5214d88c1c35b36;hp=186581f58fd28f3c198c70609a03650c10771315;hpb=0faae4b8a8a08f1442ea2cf7dcd03bc14ef38cd3;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 186581f..3d48a83 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm @@ -4,30 +4,30 @@ 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.07010'; =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. +See L and L. =cut -sub _is_case_sensitive { 1 } +sub _setup { + my $self = shift; + + $self->next::method(@_); + + if (not defined $self->preserve_case) { + $self->preserve_case(1); + } +} sub _rebless { my $self = shift; @@ -44,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) = @_; @@ -95,7 +108,7 @@ sub _table_fk_info { } $sth->finish; - return $self->_table_fk_info_builder($table); + return $self->_table_fk_info_by_sp_helpconstraint($table); } sub _table_fk_info_by_name { @@ -129,67 +142,51 @@ sub _table_fk_info_by_name { return \@rels; } -sub _table_fk_info_builder { +sub _table_fk_info_by_sp_helpconstraint { my ($self, $table) = @_; + my $warn_handler = $SIG{__WARN__} || sub { warn @_ }; + local $SIG{__WARN__} = sub { + $warn_handler->(@_) unless $_[0] =~ + /^\s*$|^Total Number of|^Details|^(?:--?|=|\+) Number|^Formula for/; + }; + my $dbh = $self->schema->storage->dbh; - local $dbh->{FetchHashKeyName} = 'NAME_lc'; - # hide "Object does not exist in this database." when trying to fetch fkeys - local $dbh->{syb_err_handler} = sub { return 0 if $_[0] == 17461; }; - my $sth = $dbh->prepare(qq{sp_fkeys \@fktable_name = @{[ $dbh->quote($table) ]}}); - $sth->execute; - my @fk_info; - while (my $row = $sth->fetchrow_hashref) { - (my $ksq = $row->{key_seq}) =~ s/\s+//g; + local $dbh->{FetchHashKeyName} = 'NAME_lc'; - my @keys = qw/pktable_name pkcolumn_name fktable_name fkcolumn_name/; - my %ds; - @ds{@keys} = @{$row}{@keys}; - $ds{key_seq} = $ksq; + my $sth = $dbh->prepare("sp_helpconstraint $table"); + $sth->execute; - push @{ $fk_info[$ksq] }, \%ds; - } + my $constraints = $sth->fetchall_arrayref({}); - my $max_keys = $#fk_info; my @rels; - for my $level (reverse 1 .. $max_keys) { - my @level_rels; - $level_rels[$level] = splice @fk_info, $level, 1; - my $count = @{ $level_rels[$level] }; - for my $sub_level (reverse 1 .. $level-1) { - my $total = @{ $fk_info[$sub_level] }; + foreach my $constraint (map $_->{definition}, @$constraints) { + my ($local_cols, $remote_table, $remote_cols) = $constraint =~ +/^$table FOREIGN KEY \(([^)]+)\) REFERENCES ([^(]+)\(([^)]+)\)/; - $level_rels[$sub_level] = [ - splice @{ $fk_info[$sub_level] }, $total-$count, $count - ]; - } - - while (1) { - my @rel = map shift @$_, @level_rels[1..$level]; - - last unless defined $rel[0]; + next unless $local_cols; - my @local_columns = map $_->{fkcolumn_name}, @rel; - my @remote_columns = map $_->{pkcolumn_name}, @rel; - my $remote_table = $rel[0]->{pktable_name}; + my @local_cols = split /,\s*/, $local_cols; + my @remote_cols = split /,\s*/, $remote_cols; - push @rels, { - local_columns => \@local_columns, - remote_columns => \@remote_columns, - remote_table => $remote_table - }; - } + push @rels, { + local_columns => \@local_cols, + remote_columns => \@remote_cols, + remote_table => $remote_table, + }; } return \@rels; } 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 +226,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 +240,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; @@ -257,6 +254,9 @@ WHERE o.name = @{[ $dbh->quote($table) ]} AND o.type = 'U' 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/; @@ -264,19 +264,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; @@ -299,6 +315,7 @@ sub _extra_column_info { =head1 SEE ALSO +L, L, L, L @@ -314,3 +331,4 @@ the same terms as Perl itself. =cut 1; +# vim:et sts=4 sw=4 tw=0: