[Bast-commits] r7699 - in DBIx-Class/0.08/trunk: . lib/DBIx/Class
lib/DBIx/Class/Storage lib/DBIx/Class/Storage/DBI
lib/DBIx/Class/Storage/DBI/Sybase t t/inflate t/lib
ribasushi at dev.catalyst.perl.org
ribasushi at dev.catalyst.perl.org
Sun Sep 20 22:25:21 GMT 2009
Author: ribasushi
Date: 2009-09-20 22:25:20 +0000 (Sun, 20 Sep 2009)
New Revision: 7699
Removed:
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Common.pm
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
DBIx-Class/0.08/trunk/t/inflate/datetime_sybase.t
Modified:
DBIx-Class/0.08/trunk/Changes
DBIx-Class/0.08/trunk/Makefile.PL
DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/AutoCast.pm
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Replicated.pm
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm
DBIx-Class/0.08/trunk/t/746mssql.t
DBIx-Class/0.08/trunk/t/746sybase.t
DBIx-Class/0.08/trunk/t/lib/sqlite.sql
Log:
Backout sybase changes
Modified: DBIx-Class/0.08/trunk/Changes
===================================================================
--- DBIx-Class/0.08/trunk/Changes 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/Changes 2009-09-20 22:25:20 UTC (rev 7699)
@@ -1,16 +1,5 @@
Revision history for DBIx::Class
- - Complete Sybase RDBMS support including:
- - Support for TEXT/IMAGE columns
- - Support for the 'money' datatype
- - Transaction savepoints support
- - DateTime inflation support
- - Support for bind variables when connecting to a newer Sybase with
- OpenClient libraries
- - Support for connections via FreeTDS with CASTs for bind variables
- when needed
- - Support for interpolated variables with proper quoting when
- connecting to an older Sybase and/or via FreeTDS
- Remove the recommends from Makefile.PL, DBIx::Class is not
supposed to have optional dependencies. ever.
- Mangle the DBIx/Class.pm POD to be more clear about
Modified: DBIx-Class/0.08/trunk/Makefile.PL
===================================================================
--- DBIx-Class/0.08/trunk/Makefile.PL 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/Makefile.PL 2009-09-20 22:25:20 UTC (rev 7699)
@@ -114,12 +114,6 @@
'DateTime::Format::Oracle' => '0',
) : ()
,
-
- $ENV{DBICTEST_SYBASE_DSN}
- ? (
- 'DateTime::Format::Sybase' => 0,
- ) : ()
- ,
);
#************************************************************************#
# Make *ABSOLUTELY SURE* that nothing on the list aboveis a real require,#
@@ -141,7 +135,7 @@
resources 'repository' => 'http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/';
resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
-no_index 'DBIx::Class::Storage::DBI::Sybase::Common';
+no_index 'DBIx::Class::Storage::DBI::Sybase::Base';
no_index 'DBIx::Class::SQLAHacks';
no_index 'DBIx::Class::SQLAHacks::MSSQL';
no_index 'DBIx::Class::Storage::DBI::AmbiguousGlob';
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -2796,10 +2796,7 @@
: (
( delete $attrs->{columns} )
||
- $source->storage->_order_select_columns(
- $source,
- [ $source->columns ],
- )
+ $source->columns
)
;
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/AutoCast.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/AutoCast.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/AutoCast.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -29,10 +29,6 @@
CAST(? as $mapped_type)
-This option can also be enabled in L<DBIx::Class::Storage::DBI/connect_info> as:
-
- on_connect_call => ['set_auto_cast']
-
=cut
sub _prep_for_execute {
@@ -64,27 +60,7 @@
return ($sql, $bind);
}
-=head2 connect_call_set_auto_cast
-Executes:
-
- $schema->storage->auto_cast(1);
-
-on connection.
-
-Used as:
-
- on_connect_call => ['set_auto_cast']
-
-in L<DBIx::Class::Storage::DBI/connect_info>.
-
-=cut
-
-sub connect_call_set_auto_cast {
- my $self = shift;
- $self->auto_cast(1);
-}
-
=head1 AUTHOR
See L<DBIx::Class/CONTRIBUTORS>
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Replicated.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Replicated.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Replicated.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -325,7 +325,6 @@
_count_select
_subq_count_select
_subq_update_delete
- _order_select_columns
svp_rollback
svp_begin
svp_release
Deleted: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Common.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Common.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Common.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -1,111 +0,0 @@
-package DBIx::Class::Storage::DBI::Sybase::Common;
-
-use strict;
-use warnings;
-
-use base qw/DBIx::Class::Storage::DBI/;
-use mro 'c3';
-
-=head1 NAME
-
-DBIx::Class::Storage::DBI::Sybase::Common - Common functionality for drivers using
-DBD::Sybase
-
-=head1 DESCRIPTION
-
-This is the base class for L<DBIx::Class::Storage::DBI::Sybase> and
-L<DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server>. It provides some
-utility methods related to L<DBD::Sybase> and the supported functions of the
-database you are connecting to.
-
-=head1 METHODS
-
-=cut
-
-sub _ping {
- my $self = shift;
-
- my $dbh = $self->_dbh or return 0;
-
- local $dbh->{RaiseError} = 1;
- local $dbh->{PrintError} = 0;
-
- if ($dbh->{syb_no_child_con}) {
-# ping is impossible with an active statement, we return false if so
- my $ping = eval { $dbh->ping };
- return $@ ? 0 : $ping;
- }
-
- eval {
-# XXX if the main connection goes stale, does opening another for this statement
-# really determine anything?
- $dbh->do('select 1');
- };
-
- return $@ ? 0 : 1;
-}
-
-sub _set_max_connect {
- my $self = shift;
- my $val = shift || 256;
-
- my $dsn = $self->_dbi_connect_info->[0];
-
- return if ref($dsn) eq 'CODE';
-
- if ($dsn !~ /maxConnect=/) {
- $self->_dbi_connect_info->[0] = "$dsn;maxConnect=$val";
- my $connected = defined $self->_dbh;
- $self->disconnect;
- $self->ensure_connected if $connected;
- }
-}
-
-=head2 using_freetds
-
-Whether or not L<DBD::Sybase> was compiled against FreeTDS. If false, it means
-the Sybase OpenClient libraries were used.
-
-=cut
-
-sub using_freetds {
- my $self = shift;
-
- return $self->_get_dbh->{syb_oc_version} =~ /freetds/i;
-}
-
-=head2 set_textsize
-
-When using FreeTDS and/or MSSQL, C<< $dbh->{LongReadLen} >> is not available,
-use this function instead. It does:
-
- $dbh->do("SET TEXTSIZE $bytes");
-
-Takes the number of bytes, or uses the C<LongReadLen> value from your
-L<DBIx::Class/connect_info> if omitted, lastly falls back to the C<32768> which
-is the L<DBD::Sybase> default.
-
-=cut
-
-sub set_textsize {
- my $self = shift;
- my $text_size = shift ||
- eval { $self->_dbi_connect_info->[-1]->{LongReadLen} } ||
- 32768; # the DBD::Sybase default
-
- return unless defined $text_size;
-
- $self->_dbh->do("SET TEXTSIZE $text_size");
-}
-
-1;
-
-=head1 AUTHORS
-
-See L<DBIx::Class/CONTRIBUTORS>.
-
-=head1 LICENSE
-
-You may distribute this code under the same terms as Perl itself.
-
-=cut
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -4,7 +4,7 @@
use warnings;
use base qw/
- DBIx::Class::Storage::DBI::Sybase::Common
+ DBIx::Class::Storage::DBI::Sybase::Base
DBIx::Class::Storage::DBI::MSSQL
/;
use mro 'c3';
@@ -20,15 +20,6 @@
}
}
-sub _init {
- my $self = shift;
-
- # LongReadLen doesn't work with MSSQL through DBD::Sybase, and the default is
- # huge on some versions of SQL server and can cause memory problems, so we
- # fix it up here (see Sybase/Common.pm)
- $self->set_textsize;
-}
-
1;
=head1 NAME
Deleted: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -1,102 +0,0 @@
-package DBIx::Class::Storage::DBI::Sybase::NoBindVars;
-
-use base qw/
- DBIx::Class::Storage::DBI::NoBindVars
- DBIx::Class::Storage::DBI::Sybase
-/;
-use mro 'c3';
-use List::Util ();
-use Scalar::Util ();
-
-sub _init {
- my $self = shift;
- $self->disable_sth_caching(1);
- $self->_identity_method('@@IDENTITY');
- $self->next::method (@_);
-}
-
-sub _fetch_identity_sql { 'SELECT ' . $_[0]->_identity_method }
-
-my $number = sub { Scalar::Util::looks_like_number($_[0]) };
-
-my $decimal = sub { $_[0] =~ /^ [-+]? \d+ (?:\.\d*)? \z/x };
-
-my %noquote = (
- int => sub { $_[0] =~ /^ [-+]? \d+ \z/x },
- bit => => sub { $_[0] =~ /^[01]\z/ },
- money => sub { $_[0] =~ /^\$ \d+ (?:\.\d*)? \z/x },
- float => $number,
- real => $number,
- double => $number,
- decimal => $decimal,
- numeric => $decimal,
-);
-
-sub interpolate_unquoted {
- my $self = shift;
- my ($type, $value) = @_;
-
- return $self->next::method(@_) if not defined $value or not defined $type;
-
- if (my $key = List::Util::first { $type =~ /$_/i } keys %noquote) {
- return 1 if $noquote{$key}->($value);
- }
- elsif ($self->is_datatype_numeric($type) && $number->($value)) {
- return 1;
- }
-
- return $self->next::method(@_);
-}
-
-sub _prep_interpolated_value {
- my ($self, $type, $value) = @_;
-
- if ($type =~ /money/i && defined $value) {
- # change a ^ not followed by \$ to a \$
- $value =~ s/^ (?! \$) /\$/x;
- }
-
- return $value;
-}
-
-1;
-
-=head1 NAME
-
-DBIx::Class::Storage::DBI::Sybase::NoBindVars - Storage::DBI subclass for Sybase
-without placeholder support
-
-=head1 DESCRIPTION
-
-If you're using this driver than your version of Sybase, or the libraries you
-use to connect to it, do not support placeholders.
-
-You can also enable this driver explicitly using:
-
- my $schema = SchemaClass->clone;
- $schema->storage_type('::DBI::Sybase::NoBindVars');
- $schema->connect($dsn, $user, $pass, \%opts);
-
-See the discussion in L<< DBD::Sybase/Using ? Placeholders & bind parameters to
-$sth->execute >> for details on the pros and cons of using placeholders.
-
-One advantage of not using placeholders is that C<select @@identity> will work
-for obtainging the last insert id of an C<IDENTITY> column, instead of having to
-do C<select max(col)> in a transaction as the base Sybase driver does.
-
-When using this driver, bind variables will be interpolated (properly quoted of
-course) into the SQL query itself, without using placeholders.
-
-The caching of prepared statements is also explicitly disabled, as the
-interpolation renders it useless.
-
-=head1 AUTHORS
-
-See L<DBIx::Class/CONTRIBUTORS>.
-
-=head1 LICENSE
-
-You may distribute this code under the same terms as Perl itself.
-
-=cut
-# vim:sts=2 sw=2:
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -4,780 +4,63 @@
use warnings;
use base qw/
- DBIx::Class::Storage::DBI::Sybase::Common
- DBIx::Class::Storage::DBI::AutoCast
+ DBIx::Class::Storage::DBI::Sybase::Base
+ DBIx::Class::Storage::DBI::NoBindVars
/;
use mro 'c3';
-use Carp::Clan qw/^DBIx::Class/;
-use List::Util ();
-use Sub::Name ();
-__PACKAGE__->mk_group_accessors('simple' =>
- qw/_identity _blob_log_on_update _writer_storage _is_writer_storage
- _identity_method/
-);
-
-my @also_proxy_to_writer_storage = qw/
- disconnect _connect_info _sql_maker _sql_maker_opts disable_sth_caching
- auto_savepoint unsafe cursor_class debug debugobj schema
-/;
-
-=head1 NAME
-
-DBIx::Class::Storage::DBI::Sybase - Sybase support for DBIx::Class
-
-=head1 SYNOPSIS
-
-This subclass supports L<DBD::Sybase> for real Sybase databases. If you are
-using an MSSQL database via L<DBD::Sybase>, your storage will be reblessed to
-L<DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server>.
-
-=head1 DESCRIPTION
-
-If your version of Sybase does not support placeholders, then your storage
-will be reblessed to L<DBIx::Class::Storage::DBI::Sybase::NoBindVars>. You can
-also enable that driver explicitly, see the documentation for more details.
-
-With this driver there is unfortunately no way to get the C<last_insert_id>
-without doing a C<SELECT MAX(col)>. This is done safely in a transaction
-(locking the table.) See L</INSERTS WITH PLACEHOLDERS>.
-
-A recommended L<DBIx::Class::Storage::DBI/connect_info> setting:
-
- on_connect_call => [['datetime_setup'], ['blob_setup', log_on_update => 0]]
-
-=head1 METHODS
-
-=cut
-
sub _rebless {
- my $self = shift;
+ my $self = shift;
- if (ref($self) eq 'DBIx::Class::Storage::DBI::Sybase') {
my $dbtype = eval {
- @{$self->_get_dbh->selectrow_arrayref(qq{sp_server_info \@attribute_id=1})}[2]
- } || '';
-
- my $exception = $@;
- $dbtype =~ s/\W/_/gi;
- my $subclass = "DBIx::Class::Storage::DBI::Sybase::${dbtype}";
-
- if (!$exception && $dbtype && $self->load_optional_class($subclass)) {
- bless $self, $subclass;
- $self->_rebless;
- } else { # real Sybase
- my $no_bind_vars = 'DBIx::Class::Storage::DBI::Sybase::NoBindVars';
-
- if ($self->using_freetds) {
- carp <<'EOF' unless $ENV{DBIC_SYBASE_FREETDS_NOWARN};
-
-You are using FreeTDS with Sybase.
-
-We will do our best to support this configuration, but please consider this
-support experimental.
-
-TEXT/IMAGE columns will definitely not work.
-
-You are encouraged to recompile DBD::Sybase with the Sybase Open Client libraries
-instead.
-
-See perldoc DBIx::Class::Storage::DBI::Sybase for more details.
-
-To turn off this warning set the DBIC_SYBASE_FREETDS_NOWARN environment
-variable.
-EOF
- if (not $self->_typeless_placeholders_supported) {
- if ($self->_placeholders_supported) {
- $self->auto_cast(1);
- } else {
- $self->ensure_class_loaded($no_bind_vars);
- bless $self, $no_bind_vars;
+ @{$self->_get_dbh
+ ->selectrow_arrayref(qq{sp_server_info \@attribute_id=1})
+ }[2]
+ };
+ unless ( $@ ) {
+ $dbtype =~ s/\W/_/gi;
+ my $subclass = "DBIx::Class::Storage::DBI::Sybase::${dbtype}";
+ if ($self->load_optional_class($subclass) && !$self->isa($subclass)) {
+ bless $self, $subclass;
$self->_rebless;
- }
}
- }
- elsif (not $self->_get_dbh->{syb_dynamic_supported}) {
- # not necessarily FreeTDS, but no placeholders nevertheless
- $self->ensure_class_loaded($no_bind_vars);
- bless $self, $no_bind_vars;
- $self->_rebless;
- } elsif (not $self->_typeless_placeholders_supported) {
-# this is highly unlikely, but we check just in case
- $self->auto_cast(1);
- }
}
- }
}
-sub _init {
- my $self = shift;
- $self->_set_max_connect(256);
-
- # based on LongReadLen in connect_info
- $self->set_textsize if $self->using_freetds;
-
-# create storage for insert/(update blob) transactions,
-# unless this is that storage
- return if $self->_is_writer_storage;
-
- my $writer_storage = (ref $self)->new;
-
- $writer_storage->_is_writer_storage(1);
- $writer_storage->connect_info($self->connect_info);
-
- $self->_writer_storage($writer_storage);
+sub _dbh_last_insert_id {
+ my ($self, $dbh, $source, $col) = @_;
+ return ($dbh->selectrow_array('select @@identity'))[0];
}
-for my $method (@also_proxy_to_writer_storage) {
- no strict 'refs';
-
- my $replaced = __PACKAGE__->can($method);
-
- *{$method} = Sub::Name::subname __PACKAGE__."::$method" => sub {
- my $self = shift;
- $self->_writer_storage->$replaced(@_) if $self->_writer_storage;
- return $self->$replaced(@_);
- };
-}
-
-# Make sure we have CHAINED mode turned on if AutoCommit is off in non-FreeTDS
-# DBD::Sybase (since we don't know how DBD::Sybase was compiled.) If however
-# we're using FreeTDS, CHAINED mode turns on an implicit transaction which we
-# only want when AutoCommit is off.
-sub _populate_dbh {
- my $self = shift;
-
- $self->next::method(@_);
-
- if (not $self->using_freetds) {
- $self->_dbh->{syb_chained_txn} = 1;
- } else {
- if ($self->_dbh_autocommit) {
- $self->_dbh->do('SET CHAINED OFF');
- } else {
- $self->_dbh->do('SET CHAINED ON');
- }
- }
-}
-
-=head2 connect_call_blob_setup
-
-Used as:
-
- on_connect_call => [ [ 'blob_setup', log_on_update => 0 ] ]
-
-Does C<< $dbh->{syb_binary_images} = 1; >> to return C<IMAGE> data as raw binary
-instead of as a hex string.
-
-Recommended.
-
-Also sets the C<log_on_update> value for blob write operations. The default is
-C<1>, but C<0> is better if your database is configured for it.
-
-See
-L<DBD::Sybase/Handling_IMAGE/TEXT_data_with_syb_ct_get_data()/syb_ct_send_data()>.
-
-=cut
-
-sub connect_call_blob_setup {
- my $self = shift;
- my %args = @_;
- my $dbh = $self->_dbh;
- $dbh->{syb_binary_images} = 1;
-
- $self->_blob_log_on_update($args{log_on_update})
- if exists $args{log_on_update};
-}
-
-sub _is_lob_type {
- my $self = shift;
- my $type = shift;
- $type && $type =~ /(?:text|image|lob|bytea|binary|memo)/i;
-}
-
-sub _prep_for_execute {
- my $self = shift;
- my ($op, $extra_bind, $ident, $args) = @_;
-
- my ($sql, $bind) = $self->next::method (@_);
-
- if ($op eq 'insert') {
- my $table = $ident->from;
-
- my $bind_info = $self->_resolve_column_info(
- $ident, [map $_->[0], @{$bind}]
- );
- my $identity_col = List::Util::first
- { $bind_info->{$_}{is_auto_increment} }
- (keys %$bind_info)
- ;
-
- if ($identity_col) {
- $sql = join ("\n",
- "SET IDENTITY_INSERT $table ON",
- $sql,
- "SET IDENTITY_INSERT $table OFF",
- );
- }
- else {
- $identity_col = List::Util::first
- { $ident->column_info($_)->{is_auto_increment} }
- $ident->columns
- ;
- }
-
- if ($identity_col) {
- $sql =
- "$sql\n" .
- $self->_fetch_identity_sql($ident, $identity_col);
- }
- }
-
- return ($sql, $bind);
-}
-
-# Stolen from SQLT, with some modifications. This is a makeshift
-# solution before a sane type-mapping library is available, thus
-# the 'our' for easy overrides.
-our %TYPE_MAPPING = (
- number => 'numeric',
- money => 'money',
- varchar => 'varchar',
- varchar2 => 'varchar',
- timestamp => 'datetime',
- text => 'varchar',
- real => 'double precision',
- comment => 'text',
- bit => 'bit',
- tinyint => 'smallint',
- float => 'double precision',
- serial => 'numeric',
- bigserial => 'numeric',
- boolean => 'varchar',
- long => 'varchar',
-);
-
-sub _native_data_type {
- my ($self, $type) = @_;
-
- $type = lc $type;
- $type =~ s/\s* identity//x;
-
- return uc($TYPE_MAPPING{$type} || $type);
-}
-
-sub _fetch_identity_sql {
- my ($self, $source, $col) = @_;
-
- return sprintf ("SELECT MAX(%s) FROM %s",
- map { $self->sql_maker->_quote ($_) } ($col, $source->from)
- );
-}
-
-sub _execute {
- my $self = shift;
- my ($op) = @_;
-
- my ($rv, $sth, @bind) = $self->dbh_do($self->can('_dbh_execute'), @_);
-
- if ($op eq 'insert') {
- $self->_identity($sth->fetchrow_array);
- $sth->finish;
- }
-
- return wantarray ? ($rv, $sth, @bind) : $rv;
-}
-
-sub last_insert_id { shift->_identity }
-
-# handles TEXT/IMAGE and transaction for last_insert_id
-sub insert {
- my $self = shift;
- my ($source, $to_insert) = @_;
-
- my $blob_cols = $self->_remove_blob_cols($source, $to_insert);
-
- my $identity_col = List::Util::first
- { $source->column_info($_)->{is_auto_increment} }
- $source->columns;
-
- # do we need the horrific SELECT MAX(COL) hack?
- my $dumb_last_insert_id =
- $identity_col
- && (not exists $to_insert->{$identity_col})
- && ($self->_identity_method||'') ne '@@IDENTITY';
-
- my $next = $self->next::can;
-
- # we are already in a transaction, or there are no blobs
- # and we don't need the PK - just (try to) do it
- if ($self->{transaction_depth}
- || (!$blob_cols && !$dumb_last_insert_id)
- ) {
- return $self->_insert (
- $next, $source, $to_insert, $blob_cols, $identity_col
- );
- }
-
- # otherwise use the _writer_storage to do the insert+transaction on another
- # connection
- my $guard = $self->_writer_storage->txn_scope_guard;
-
- my $updated_cols = $self->_writer_storage->_insert (
- $next, $source, $to_insert, $blob_cols, $identity_col
- );
-
- $self->_identity($self->_writer_storage->_identity);
-
- $guard->commit;
-
- return $updated_cols;
-}
-
-sub _insert {
- my ($self, $next, $source, $to_insert, $blob_cols, $identity_col) = @_;
-
- my $updated_cols = $self->$next ($source, $to_insert);
-
- my $final_row = {
- $identity_col => $self->last_insert_id($source, $identity_col),
- %$to_insert,
- %$updated_cols,
- };
-
- $self->_insert_blobs ($source, $blob_cols, $final_row) if $blob_cols;
-
- return $updated_cols;
-}
-
-sub update {
- my $self = shift;
- my ($source, $fields, $where) = @_;
-
- my $wantarray = wantarray;
- my $blob_cols = $self->_remove_blob_cols($source, $fields);
-
- if (not $blob_cols) {
- return $self->next::method(@_);
- }
-
-# update+blob update(s) done atomically on separate connection
- $self = $self->_writer_storage;
-
- my $guard = $self->txn_scope_guard;
-
- my @res;
- if ($wantarray) {
- @res = $self->next::method(@_);
- }
- elsif (defined $wantarray) {
- $res[0] = $self->next::method(@_);
- }
- else {
- $self->next::method(@_);
- }
-
- $self->_update_blobs($source, $blob_cols, $where);
-
- $guard->commit;
-
- return $wantarray ? @res : $res[0];
-}
-
-### the insert_bulk stuff stolen from DBI/MSSQL.pm
-
-sub _set_identity_insert {
- my ($self, $table) = @_;
-
- my $sql = sprintf (
- 'SET IDENTITY_INSERT %s ON',
- $self->sql_maker->_quote ($table),
- );
-
- my $dbh = $self->_get_dbh;
- eval { $dbh->do ($sql) };
- if ($@) {
- $self->throw_exception (sprintf "Error executing '%s': %s",
- $sql,
- $dbh->errstr,
- );
- }
-}
-
-sub _unset_identity_insert {
- my ($self, $table) = @_;
-
- my $sql = sprintf (
- 'SET IDENTITY_INSERT %s OFF',
- $self->sql_maker->_quote ($table),
- );
-
- my $dbh = $self->_get_dbh;
- $dbh->do ($sql);
-}
-
-# XXX this should use the DBD::Sybase bulk API, where possible
-sub insert_bulk {
- my $self = shift;
- my ($source, $cols, $data) = @_;
-
- my $is_identity_insert = (List::Util::first
- { $source->column_info ($_)->{is_auto_increment} }
- (@{$cols})
- )
- ? 1
- : 0;
-
- if ($is_identity_insert) {
- $self->_set_identity_insert ($source->name);
- }
-
- $self->next::method(@_);
-
- if ($is_identity_insert) {
- $self->_unset_identity_insert ($source->name);
- }
-}
-
-### end of stolen insert_bulk section
-
-sub _remove_blob_cols {
- my ($self, $source, $fields) = @_;
-
- my %blob_cols;
-
- for my $col (keys %$fields) {
- if ($self->_is_lob_type($source->column_info($col)->{data_type})) {
- $blob_cols{$col} = delete $fields->{$col};
- $fields->{$col} = \"''";
- }
- }
-
- return keys %blob_cols ? \%blob_cols : undef;
-}
-
-sub _update_blobs {
- my ($self, $source, $blob_cols, $where) = @_;
-
- my (@primary_cols) = $source->primary_columns;
-
- $self->throw_exception('Cannot update TEXT/IMAGE column(s) without a primary key')
- unless @primary_cols;
-
-# check if we're updating a single row by PK
- my $pk_cols_in_where = 0;
- for my $col (@primary_cols) {
- $pk_cols_in_where++ if defined $where->{$col};
- }
- my @rows;
-
- if ($pk_cols_in_where == @primary_cols) {
- my %row_to_update;
- @row_to_update{@primary_cols} = @{$where}{@primary_cols};
- @rows = \%row_to_update;
- } else {
- my $cursor = $self->select ($source, \@primary_cols, $where, {});
- @rows = map {
- my %row; @row{@primary_cols} = @$_; \%row
- } $cursor->all;
- }
-
- for my $row (@rows) {
- $self->_insert_blobs($source, $blob_cols, $row);
- }
-}
-
-sub _insert_blobs {
- my ($self, $source, $blob_cols, $row) = @_;
- my $dbh = $self->_get_dbh;
-
- my $table = $source->from;
-
- my %row = %$row;
- my (@primary_cols) = $source->primary_columns;
-
- $self->throw_exception('Cannot update TEXT/IMAGE column(s) without a primary key')
- unless @primary_cols;
-
- $self->throw_exception('Cannot update TEXT/IMAGE column(s) without primary key values')
- if ((grep { defined $row{$_} } @primary_cols) != @primary_cols);
-
- for my $col (keys %$blob_cols) {
- my $blob = $blob_cols->{$col};
-
- my %where = map { ($_, $row{$_}) } @primary_cols;
-
- my $cursor = $self->select ($source, [$col], \%where, {});
- $cursor->next;
- my $sth = $cursor->sth;
-
- eval {
- do {
- $sth->func('CS_GET', 1, 'ct_data_info') or die $sth->errstr;
- } while $sth->fetch;
-
- $sth->func('ct_prepare_send') or die $sth->errstr;
-
- my $log_on_update = $self->_blob_log_on_update;
- $log_on_update = 1 if not defined $log_on_update;
-
- $sth->func('CS_SET', 1, {
- total_txtlen => length($blob),
- log_on_update => $log_on_update
- }, 'ct_data_info') or die $sth->errstr;
-
- $sth->func($blob, length($blob), 'ct_send_data') or die $sth->errstr;
-
- $sth->func('ct_finish_send') or die $sth->errstr;
- };
- my $exception = $@;
- $sth->finish if $sth;
- if ($exception) {
- if ($self->using_freetds) {
- $self->throw_exception (
- 'TEXT/IMAGE operation failed, probably because you are using FreeTDS: '
- . $exception
- );
- } else {
- $self->throw_exception($exception);
- }
- }
- }
-}
-
-=head2 connect_call_datetime_setup
-
-Used as:
-
- on_connect_call => 'datetime_setup'
-
-In L<DBIx::Class::Storage::DBI/connect_info> to set:
-
- $dbh->syb_date_fmt('ISO_strict'); # output fmt: 2004-08-21T14:36:48.080Z
- $dbh->do('set dateformat mdy'); # input fmt: 08/13/1979 18:08:55.080
-
-On connection for use with L<DBIx::Class::InflateColumn::DateTime>, using
-L<DateTime::Format::Sybase>, which you will need to install.
-
-This works for both C<DATETIME> and C<SMALLDATETIME> columns, although
-C<SMALLDATETIME> columns only have minute precision.
-
-=cut
-
-{
- my $old_dbd_warned = 0;
-
- sub connect_call_datetime_setup {
- my $self = shift;
- my $dbh = $self->_dbh;
-
- if ($dbh->can('syb_date_fmt')) {
- # amazingly, this works with FreeTDS
- $dbh->syb_date_fmt('ISO_strict');
- } elsif (not $old_dbd_warned) {
- carp "Your DBD::Sybase is too old to support ".
- "DBIx::Class::InflateColumn::DateTime, please upgrade!";
- $old_dbd_warned = 1;
- }
-
- $dbh->do('SET DATEFORMAT mdy');
-
- 1;
- }
-}
-
-sub datetime_parser_type { "DateTime::Format::Sybase" }
-
-# ->begin_work and such have no effect with FreeTDS but we run them anyway to
-# let the DBD keep any state it needs to.
-#
-# If they ever do start working, the extra statements will do no harm (because
-# Sybase supports nested transactions.)
-
-sub _dbh_begin_work {
- my $self = shift;
- $self->next::method(@_);
- if ($self->using_freetds) {
- $self->_get_dbh->do('BEGIN TRAN');
- }
-}
-
-sub _dbh_commit {
- my $self = shift;
- if ($self->using_freetds) {
- $self->_dbh->do('COMMIT');
- }
- return $self->next::method(@_);
-}
-
-sub _dbh_rollback {
- my $self = shift;
- if ($self->using_freetds) {
- $self->_dbh->do('ROLLBACK');
- }
- return $self->next::method(@_);
-}
-
-# savepoint support using ASE syntax
-
-sub _svp_begin {
- my ($self, $name) = @_;
-
- $self->_get_dbh->do("SAVE TRANSACTION $name");
-}
-
-# A new SAVE TRANSACTION with the same name releases the previous one.
-sub _svp_release { 1 }
-
-sub _svp_rollback {
- my ($self, $name) = @_;
-
- $self->_get_dbh->do("ROLLBACK TRANSACTION $name");
-}
-
1;
-=head1 Schema::Loader Support
+=head1 NAME
-There is an experimental branch of L<DBIx::Class::Schema::Loader> that will
-allow you to dump a schema from most (if not all) versions of Sybase.
+DBIx::Class::Storage::DBI::Sybase - Storage::DBI subclass for Sybase
-It is available via subversion from:
+=head1 SYNOPSIS
- http://dev.catalyst.perl.org/repos/bast/branches/DBIx-Class-Schema-Loader/current/
+This subclass supports L<DBD::Sybase> for real Sybase databases. If
+you are using an MSSQL database via L<DBD::Sybase>, see
+L<DBIx::Class::Storage::DBI::Sybase::MSSQL>.
-=head1 FreeTDS
+=head1 CAVEATS
-This driver supports L<DBD::Sybase> compiled against FreeTDS
-(L<http://www.freetds.org/>) to the best of our ability, however it is
-recommended that you recompile L<DBD::Sybase> against the Sybase Open Client
-libraries. They are a part of the Sybase ASE distribution:
+This storage driver uses L<DBIx::Class::Storage::DBI::NoBindVars> as a base.
+This means that bind variables will be interpolated (properly quoted of course)
+into the SQL query itself, without using bind placeholders.
-The Open Client FAQ is here:
-L<http://www.isug.com/Sybase_FAQ/ASE/section7.html>.
+More importantly this means that caching of prepared statements is explicitly
+disabled, as the interpolation renders it useless.
-Sybase ASE for Linux (which comes with the Open Client libraries) may be
-downloaded here: L<http://response.sybase.com/forms/ASE_Linux_Download>.
+=head1 AUTHORS
-To see if you're using FreeTDS check C<< $schema->storage->using_freetds >>, or run:
+Brandon L Black <blblack at gmail.com>
- perl -MDBI -le 'my $dbh = DBI->connect($dsn, $user, $pass); print $dbh->{syb_oc_version}'
+Justin Hunter <justin.d.hunter at gmail.com>
-Some versions of the libraries involved will not support placeholders, in which
-case the storage will be reblessed to
-L<DBIx::Class::Storage::DBI::Sybase::NoBindVars>.
-
-In some configurations, placeholders will work but will throw implicit type
-conversion errors for anything that's not expecting a string. In such a case,
-the C<auto_cast> option from L<DBIx::Class::Storage::DBI::AutoCast> is
-automatically set, which you may enable on connection with
-L<DBIx::Class::Storage::DBI::AutoCast/connect_call_set_auto_cast>. The type info
-for the C<CAST>s is taken from the L<DBIx::Class::ResultSource/data_type>
-definitions in your Result classes, and are mapped to a Sybase type (if it isn't
-already) using a mapping based on L<SQL::Translator>.
-
-In other configurations, placeholers will work just as they do with the Sybase
-Open Client libraries.
-
-Inserts or updates of TEXT/IMAGE columns will B<NOT> work with FreeTDS.
-
-=head1 INSERTS WITH PLACEHOLDERS
-
-With placeholders enabled, inserts are done in a transaction so that there are
-no concurrency issues with getting the inserted identity value using
-C<SELECT MAX(col)>, which is the only way to get the C<IDENTITY> value in this
-mode.
-
-In addition, they are done on a separate connection so that it's possible to
-have active cursors when doing an insert.
-
-When using C<DBIx::Class::Storage::DBI::Sybase::NoBindVars> transactions are
-disabled, as there are no concurrency issues with C<SELECT @@IDENTITY> as it's a
-session variable.
-
-=head1 TRANSACTIONS
-
-Due to limitations of the TDS protocol, L<DBD::Sybase>, or both; you cannot
-begin a transaction while there are active cursors. An active cursor is, for
-example, a L<ResultSet|DBIx::Class::ResultSet> that has been executed using
-C<next> or C<first> but has not been exhausted or
-L<reset|DBIx::Class::ResultSet/reset>.
-
-For example, this will not work:
-
- $schema->txn_do(sub {
- my $rs = $schema->resultset('Book');
- while (my $row = $rs->next) {
- $schema->resultset('MetaData')->create({
- book_id => $row->id,
- ...
- });
- }
- });
-
-Transactions done for inserts in C<AutoCommit> mode when placeholders are in use
-are not affected, as they are done on an extra database handle.
-
-Some workarounds:
-
-=over 4
-
-=item * use L<DBIx::Class::Storage::DBI::Replicated>
-
-=item * L<connect|DBIx::Class::Schema/connect> another L<Schema|DBIx::Class::Schema>
-
-=item * load the data from your cursor with L<DBIx::Class::ResultSet/all>
-
-=back
-
-=head1 MAXIMUM CONNECTIONS
-
-The TDS protocol makes separate connections to the server for active statements
-in the background. By default the number of such connections is limited to 25,
-on both the client side and the server side.
-
-This is a bit too low for a complex L<DBIx::Class> application, so on connection
-the client side setting is set to C<256> (see L<DBD::Sybase/maxConnect>.) You
-can override it to whatever setting you like in the DSN.
-
-See
-L<http://infocenter.sybase.com/help/index.jsp?topic=/com.sybase.help.ase_15.0.sag1/html/sag1/sag1272.htm>
-for information on changing the setting on the server side.
-
-=head1 DATES
-
-See L</connect_call_datetime_setup> to setup date formats
-for L<DBIx::Class::InflateColumn::DateTime>.
-
-=head1 TEXT/IMAGE COLUMNS
-
-L<DBD::Sybase> compiled with FreeTDS will B<NOT> allow you to insert or update
-C<TEXT/IMAGE> columns.
-
-Setting C<< $dbh->{LongReadLen} >> will also not work with FreeTDS use either:
-
- $schema->storage->dbh->do("SET TEXTSIZE $bytes");
-
-or
-
- $schema->storage->set_textsize($bytes);
-
-instead.
-
-However, the C<LongReadLen> you pass in
-L<DBIx::Class::Storage::DBI/connect_info> is used to execute the equivalent
-C<SET TEXTSIZE> command on connection.
-
-See L</connect_call_blob_setup> for a L<DBIx::Class::Storage::DBI/connect_info>
-setting you need to work with C<IMAGE> columns.
-
-=head1 AUTHOR
-
-See L<DBIx::Class/CONTRIBUTORS>.
-
=head1 LICENSE
You may distribute this code under the same terms as Perl itself.
=cut
-# vim:sts=2 sw=2:
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm 2009-09-20 22:25:20 UTC (rev 7699)
@@ -1993,18 +1993,6 @@
return @pcols ? \@pcols : [ 1 ];
}
-#
-# Returns an ordered list of column names before they are used
-# in a SELECT statement. By default simply returns the list
-# passed in.
-#
-# This may be overridden in a specific storage when there are
-# requirements such as moving BLOB columns to the end of the
-# SELECT list.
-sub _order_select_columns {
- #my ($self, $source, $columns) = @_;
- return @{$_[2]};
-}
sub source_bind_attributes {
my ($self, $source) = @_;
Modified: DBIx-Class/0.08/trunk/t/746mssql.t
===================================================================
--- DBIx-Class/0.08/trunk/t/746mssql.t 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/t/746mssql.t 2009-09-20 22:25:20 UTC (rev 7699)
@@ -143,11 +143,14 @@
my ($storage, $dbh) = @_;
eval { $dbh->do("DROP TABLE money_test") };
$dbh->do(<<'SQL');
+
CREATE TABLE money_test (
id INT IDENTITY PRIMARY KEY,
amount MONEY NULL
)
+
SQL
+
});
my $rs = $schema->resultset('Money');
Modified: DBIx-Class/0.08/trunk/t/746sybase.t
===================================================================
--- DBIx-Class/0.08/trunk/t/746sybase.t 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/t/746sybase.t 2009-09-20 22:25:20 UTC (rev 7699)
@@ -1,453 +1,91 @@
use strict;
-use warnings;
-no warnings 'uninitialized';
+use warnings;
use Test::More;
use Test::Exception;
use lib qw(t/lib);
use DBICTest;
-use DBIx::Class::Storage::DBI::Sybase;
-use DBIx::Class::Storage::DBI::Sybase::NoBindVars;
my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_${_}" } qw/DSN USER PASS/};
-my $TESTS = 48 + 2;
+plan skip_all => 'Set $ENV{DBICTEST_SYBASE_DSN}, _USER and _PASS to run this test'
+ unless ($dsn && $user);
-if (not ($dsn && $user)) {
- plan skip_all =>
- 'Set $ENV{DBICTEST_SYBASE_DSN}, _USER and _PASS to run this test' .
- "\nWarning: This test drops and creates the tables " .
- "'artist', 'money_test' and 'bindtype_test'";
-} else {
- plan tests => $TESTS*2 + 1;
-}
+plan tests => 13;
-my @storage_types = (
- 'DBI::Sybase',
- 'DBI::Sybase::NoBindVars',
-);
-my $schema;
-my $storage_idx = -1;
+my $schema = DBICTest::Schema->connect($dsn, $user, $pass, {AutoCommit => 1});
-sub get_schema {
- DBICTest::Schema->connect($dsn, $user, $pass, {
- on_connect_call => [
- [ blob_setup => log_on_update => 1 ], # this is a safer option
- ],
- });
-}
+# start disconnected to test reconnection
+$schema->storage->ensure_connected;
+$schema->storage->_dbh->disconnect;
-my $ping_count = 0;
-{
- my $ping = DBIx::Class::Storage::DBI::Sybase->can('_ping');
- *DBIx::Class::Storage::DBI::Sybase::_ping = sub {
- $ping_count++;
- goto $ping;
- };
-}
+isa_ok( $schema->storage, 'DBIx::Class::Storage::DBI::Sybase' );
-for my $storage_type (@storage_types) {
- $storage_idx++;
+my $dbh;
+lives_ok (sub {
+ $dbh = $schema->storage->dbh;
+}, 'reconnect works');
- unless ($storage_type eq 'DBI::Sybase') { # autodetect
- DBICTest::Schema->storage_type("::$storage_type");
- }
+$schema->storage->dbh_do (sub {
+ my ($storage, $dbh) = @_;
+ eval { $dbh->do("DROP TABLE artist") };
+ $dbh->do(<<'SQL');
- $schema = get_schema();
-
- $schema->storage->ensure_connected;
-
- if ($storage_idx == 0 &&
- $schema->storage->isa('DBIx::Class::Storage::DBI::Sybase::NoBindVars')) {
-# no placeholders in this version of Sybase or DBD::Sybase (or using FreeTDS)
- my $tb = Test::More->builder;
- $tb->skip('no placeholders') for 1..$TESTS;
- next;
- }
-
- isa_ok( $schema->storage, "DBIx::Class::Storage::$storage_type" );
-
- $schema->storage->_dbh->disconnect;
- lives_ok (sub { $schema->storage->dbh }, 'reconnect works');
-
- $schema->storage->dbh_do (sub {
- my ($storage, $dbh) = @_;
- eval { $dbh->do("DROP TABLE artist") };
- $dbh->do(<<'SQL');
CREATE TABLE artist (
- artistid INT IDENTITY PRIMARY KEY,
+ artistid INT IDENTITY NOT NULL,
name VARCHAR(100),
rank INT DEFAULT 13 NOT NULL,
- charfield CHAR(10) NULL
+ charfield CHAR(10) NULL,
+ primary key(artistid)
)
+
SQL
- });
- my %seen_id;
+});
-# so we start unconnected
- $schema->storage->disconnect;
+my %seen_id;
+# fresh $schema so we start unconnected
+$schema = DBICTest::Schema->connect($dsn, $user, $pass, {AutoCommit => 1});
+
# test primary key handling
- my $new = $schema->resultset('Artist')->create({ name => 'foo' });
- ok($new->artistid > 0, "Auto-PK worked");
+my $new = $schema->resultset('Artist')->create({ name => 'foo' });
+ok($new->artistid > 0, "Auto-PK worked");
- $seen_id{$new->artistid}++;
+$seen_id{$new->artistid}++;
-# check redispatch to storage-specific insert when auto-detected storage
- if ($storage_type eq 'DBI::Sybase') {
- DBICTest::Schema->storage_type('::DBI');
- $schema = get_schema();
- }
-
- $new = $schema->resultset('Artist')->create({ name => 'Artist 1' });
- is ( $seen_id{$new->artistid}, undef, 'id for Artist 1 is unique' );
- $seen_id{$new->artistid}++;
-
-# inserts happen in a txn, so we make sure it still works inside a txn too
- $schema->txn_begin;
-
- for (2..6) {
+# test LIMIT support
+for (1..6) {
$new = $schema->resultset('Artist')->create({ name => 'Artist ' . $_ });
is ( $seen_id{$new->artistid}, undef, "id for Artist $_ is unique" );
$seen_id{$new->artistid}++;
- }
+}
- $schema->txn_commit;
+my $it;
-# test simple count
- is ($schema->resultset('Artist')->count, 7, 'count(*) of whole table ok');
-
-# test LIMIT support
- my $it = $schema->resultset('Artist')->search({
- artistid => { '>' => 0 }
- }, {
+$it = $schema->resultset('Artist')->search( {}, {
rows => 3,
order_by => 'artistid',
- });
+});
- is( $it->count, 3, "LIMIT count ok" );
+TODO: {
+ local $TODO = 'Sybase is very very fucked in the limit department';
- is( $it->next->name, "foo", "iterator->next ok" );
- $it->next;
- is( $it->next->name, "Artist 2", "iterator->next ok" );
- is( $it->next, undef, "next past end of resultset ok" );
+ is( $it->count, 3, "LIMIT count ok" );
+}
-# now try with offset
- $it = $schema->resultset('Artist')->search({}, {
- rows => 3,
- offset => 3,
- order_by => 'artistid',
- });
+# The iterator still works correctly with rows => 3, even though the sql is
+# fucked, very interesting.
- is( $it->count, 3, "LIMIT with offset count ok" );
+is( $it->next->name, "foo", "iterator->next ok" );
+$it->next;
+is( $it->next->name, "Artist 2", "iterator->next ok" );
+is( $it->next, undef, "next past end of resultset ok" );
- is( $it->next->name, "Artist 3", "iterator->next ok" );
- $it->next;
- is( $it->next->name, "Artist 5", "iterator->next ok" );
- is( $it->next, undef, "next past end of resultset ok" );
-# now try a grouped count
- $schema->resultset('Artist')->create({ name => 'Artist 6' })
- for (1..6);
-
- $it = $schema->resultset('Artist')->search({}, {
- group_by => 'name'
- });
-
- is( $it->count, 7, 'COUNT of GROUP_BY ok' );
-
-# do an identity insert (which should happen with no txn when using
-# placeholders.)
- {
- no warnings 'redefine';
-
- my @debug_out;
- local $schema->storage->{debug} = 1;
- local $schema->storage->debugobj->{callback} = sub {
- push @debug_out, $_[1];
- };
-
- my $txn_used = 0;
- my $txn_commit = \&DBIx::Class::Storage::DBI::txn_commit;
- local *DBIx::Class::Storage::DBI::txn_commit = sub {
- $txn_used = 1;
- goto &$txn_commit;
- };
-
- $schema->resultset('Artist')
- ->create({ artistid => 999, name => 'mtfnpy' });
-
- ok((grep /IDENTITY_INSERT/i, @debug_out), 'IDENTITY_INSERT');
-
- SKIP: {
- skip 'not testing lack of txn on IDENTITY_INSERT with NoBindVars', 1
- if $storage_type =~ /NoBindVars/i;
-
- is $txn_used, 0, 'no txn on insert with IDENTITY_INSERT';
- }
- }
-
-# test insert_bulk using populate, this should always pass whether or not it
-# does anything Sybase specific or not. Just here to aid debugging.
- lives_ok {
- $schema->resultset('Artist')->populate([
- {
- name => 'bulk artist 1',
- charfield => 'foo',
- },
- {
- name => 'bulk artist 2',
- charfield => 'foo',
- },
- {
- name => 'bulk artist 3',
- charfield => 'foo',
- },
- ]);
- } 'insert_bulk via populate';
-
- my $bulk_rs = $schema->resultset('Artist')->search({
- name => { -like => 'bulk artist %' }
- });
-
- is $bulk_rs->count, 3, 'correct number inserted via insert_bulk';
-
- is ((grep $_->charfield eq 'foo', $bulk_rs->all), 3,
- 'column set correctly via insert_bulk');
-
- my %bulk_ids;
- @bulk_ids{map $_->artistid, $bulk_rs->all} = ();
-
- is ((scalar keys %bulk_ids), 3,
- 'identities generated correctly in insert_bulk');
-
- $bulk_rs->delete;
-
-# now test insert_bulk with IDENTITY_INSERT
- lives_ok {
- $schema->resultset('Artist')->populate([
- {
- artistid => 2001,
- name => 'bulk artist 1',
- charfield => 'foo',
- },
- {
- artistid => 2002,
- name => 'bulk artist 2',
- charfield => 'foo',
- },
- {
- artistid => 2003,
- name => 'bulk artist 3',
- charfield => 'foo',
- },
- ]);
- } 'insert_bulk with IDENTITY_INSERT via populate';
-
- is $bulk_rs->count, 3,
- 'correct number inserted via insert_bulk with IDENTITY_INSERT';
-
- is ((grep $_->charfield eq 'foo', $bulk_rs->all), 3,
- 'column set correctly via insert_bulk with IDENTITY_INSERT');
-
- $bulk_rs->delete;
-
-# test correlated subquery
- my $subq = $schema->resultset('Artist')->search({ artistid => { '>' => 3 } })
- ->get_column('artistid')
- ->as_query;
- my $subq_rs = $schema->resultset('Artist')->search({
- artistid => { -in => $subq }
- });
- is $subq_rs->count, 11, 'correlated subquery';
-
-# mostly stolen from the blob stuff Nniuq wrote for t/73oracle.t
- SKIP: {
- skip 'TEXT/IMAGE support does not work with FreeTDS', 13
- if $schema->storage->using_freetds;
-
- my $dbh = $schema->storage->_dbh;
- {
- local $SIG{__WARN__} = sub {};
- eval { $dbh->do('DROP TABLE bindtype_test') };
-
- $dbh->do(qq[
- CREATE TABLE bindtype_test
- (
- id INT IDENTITY PRIMARY KEY,
- bytea INT NULL,
- blob IMAGE NULL,
- clob TEXT NULL
- )
- ],{ RaiseError => 1, PrintError => 0 });
- }
-
- my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
- $binstr{'large'} = $binstr{'small'} x 1024;
-
- my $maxloblen = length $binstr{'large'};
-
- if (not $schema->storage->using_freetds) {
- $dbh->{'LongReadLen'} = $maxloblen * 2;
- } else {
- $dbh->do("set textsize ".($maxloblen * 2));
- }
-
- my $rs = $schema->resultset('BindType');
- my $last_id;
-
- foreach my $type (qw(blob clob)) {
- foreach my $size (qw(small large)) {
- no warnings 'uninitialized';
-
- my $created = eval { $rs->create( { $type => $binstr{$size} } ) };
- ok(!$@, "inserted $size $type without dying");
- diag $@ if $@;
-
- $last_id = $created->id if $created;
-
- my $got = eval {
- $rs->find($last_id)->$type
- };
- diag $@ if $@;
- ok($got eq $binstr{$size}, "verified inserted $size $type");
- }
- }
-
- # blob insert with explicit PK
- # also a good opportunity to test IDENTITY_INSERT
- {
- local $SIG{__WARN__} = sub {};
- eval { $dbh->do('DROP TABLE bindtype_test') };
-
- $dbh->do(qq[
- CREATE TABLE bindtype_test
- (
- id INT IDENTITY PRIMARY KEY,
- bytea INT NULL,
- blob IMAGE NULL,
- clob TEXT NULL
- )
- ],{ RaiseError => 1, PrintError => 0 });
- }
- my $created = eval { $rs->create( { id => 1, blob => $binstr{large} } ) };
- ok(!$@, "inserted large blob without dying with manual PK");
- diag $@ if $@;
-
- my $got = eval {
- $rs->find(1)->blob
- };
- diag $@ if $@;
- ok($got eq $binstr{large}, "verified inserted large blob with manual PK");
-
- # try a blob update
- my $new_str = $binstr{large} . 'mtfnpy';
-
- # check redispatch to storage-specific update when auto-detected storage
- if ($storage_type eq 'DBI::Sybase') {
- DBICTest::Schema->storage_type('::DBI');
- $schema = get_schema();
- }
-
- eval { $rs->search({ id => 1 })->update({ blob => $new_str }) };
- ok !$@, 'updated blob successfully';
- diag $@ if $@;
- $got = eval {
- $rs->find(1)->blob
- };
- diag $@ if $@;
- ok($got eq $new_str, "verified updated blob");
-
- ## try multi-row blob update
- # first insert some blobs
- $rs->find(1)->delete;
- $rs->create({ blob => $binstr{large} }) for (1..3);
- $new_str = $binstr{large} . 'foo';
- $rs->update({ blob => $new_str });
- is((grep $_->blob eq $new_str, $rs->all), 3, 'multi-row blob update');
- }
-
-# test MONEY column support
- $schema->storage->dbh_do (sub {
- my ($storage, $dbh) = @_;
- eval { $dbh->do("DROP TABLE money_test") };
- $dbh->do(<<'SQL');
-CREATE TABLE money_test (
- id INT IDENTITY PRIMARY KEY,
- amount MONEY NULL
-)
-SQL
- });
-
-# test insert transaction when there's an active cursor
- SKIP: {
- skip 'not testing insert with active cursor if using ::NoBindVars', 1
- if $storage_type =~ /NoBindVars/i;
-
- my $artist_rs = $schema->resultset('Artist');
- $artist_rs->first;
- lives_ok {
- my $row = $schema->resultset('Money')->create({ amount => 100 });
- $row->delete;
- } 'inserted a row with an active cursor';
- $ping_count-- if $@; # dbh_do calls ->connected
- }
-
-# test insert in an outer transaction when there's an active cursor
- TODO: {
- local $TODO = 'this should work once we have eager cursors';
-
-# clear state, or we get a deadlock on $row->delete
-# XXX figure out why this happens
- $schema->storage->disconnect;
-
- lives_ok {
- $schema->txn_do(sub {
- my $artist_rs = $schema->resultset('Artist');
- $artist_rs->first;
- my $row = $schema->resultset('Money')->create({ amount => 100 });
- $row->delete;
- });
- } 'inserted a row with an active cursor in outer txn';
- $ping_count-- if $@; # dbh_do calls ->connected
- }
-
-# Now test money values.
- my $rs = $schema->resultset('Money');
-
- my $row;
- lives_ok {
- $row = $rs->create({ amount => 100 });
- } 'inserted a money value';
-
- is eval { $rs->find($row->id)->amount }, 100, 'money value round-trip';
-
- lives_ok {
- $row->update({ amount => 200 });
- } 'updated a money value';
-
- is eval { $rs->find($row->id)->amount },
- 200, 'updated money value round-trip';
-
- lives_ok {
- $row->update({ amount => undef });
- } 'updated a money value to NULL';
-
- my $null_amount = eval { $rs->find($row->id)->amount };
- ok(
- (($null_amount == undef) && (not $@)),
- 'updated money value to NULL round-trip'
- );
- diag $@ if $@;
-}
-
-is $ping_count, 0, 'no pings';
-
# clean up our mess
END {
- if (my $dbh = eval { $schema->storage->_dbh }) {
- eval { $dbh->do("DROP TABLE $_") }
- for qw/artist bindtype_test money_test/;
- }
+ my $dbh = eval { $schema->storage->_dbh };
+ $dbh->do('DROP TABLE artist') if $dbh;
}
+
Deleted: DBIx-Class/0.08/trunk/t/inflate/datetime_sybase.t
===================================================================
--- DBIx-Class/0.08/trunk/t/inflate/datetime_sybase.t 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/t/inflate/datetime_sybase.t 2009-09-20 22:25:20 UTC (rev 7699)
@@ -1,85 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More;
-use Test::Exception;
-use lib qw(t/lib);
-use DBICTest;
-
-my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_${_}" } qw/DSN USER PASS/};
-
-if (not ($dsn && $user)) {
- plan skip_all =>
- 'Set $ENV{DBICTEST_SYBASE_DSN}, _USER and _PASS to run this test' .
- "\nWarning: This test drops and creates a table called 'track'";
-} else {
- eval "use DateTime; use DateTime::Format::Sybase;";
- if ($@) {
- plan skip_all => 'needs DateTime and DateTime::Format::Sybase for testing';
- }
- else {
- plan tests => (4 * 2 * 2) + 2; # (tests * dt_types * storage_types) + storage_tests
- }
-}
-
-my @storage_types = (
- 'DBI::Sybase',
- 'DBI::Sybase::NoBindVars',
-);
-my $schema;
-
-for my $storage_type (@storage_types) {
- $schema = DBICTest::Schema->clone;
-
- unless ($storage_type eq 'DBI::Sybase') { # autodetect
- $schema->storage_type("::$storage_type");
- }
- $schema->connection($dsn, $user, $pass, {
- AutoCommit => 1,
- on_connect_call => [ 'datetime_setup' ],
- });
-
- $schema->storage->ensure_connected;
-
- isa_ok( $schema->storage, "DBIx::Class::Storage::$storage_type" );
-
-# coltype, col, date
- my @dt_types = (
- ['DATETIME', 'last_updated_at', '2004-08-21T14:36:48.080Z'],
-# minute precision
- ['SMALLDATETIME', 'small_dt', '2004-08-21T14:36:00.000Z'],
- );
-
- for my $dt_type (@dt_types) {
- my ($type, $col, $sample_dt) = @$dt_type;
-
- eval { $schema->storage->dbh->do("DROP TABLE track") };
- $schema->storage->dbh->do(<<"SQL");
-CREATE TABLE track (
- trackid INT IDENTITY PRIMARY KEY,
- cd INT,
- position INT,
- $col $type,
-)
-SQL
- ok(my $dt = DateTime::Format::Sybase->parse_datetime($sample_dt));
-
- my $row;
- ok( $row = $schema->resultset('Track')->create({
- $col => $dt,
- cd => 1,
- }));
- ok( $row = $schema->resultset('Track')
- ->search({ trackid => $row->trackid }, { select => [$col] })
- ->first
- );
- is( $row->$col, $dt, 'DateTime roundtrip' );
- }
-}
-
-# clean up our mess
-END {
- if (my $dbh = eval { $schema->storage->_dbh }) {
- $dbh->do('DROP TABLE track');
- }
-}
Modified: DBIx-Class/0.08/trunk/t/lib/sqlite.sql
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/sqlite.sql 2009-09-20 21:48:12 UTC (rev 7698)
+++ DBIx-Class/0.08/trunk/t/lib/sqlite.sql 2009-09-20 22:25:20 UTC (rev 7699)
@@ -1,5 +1,7 @@
--- Created on Tue Aug 25 12:34:34 2009
--
+-- Created by SQL::Translator::Producer::SQLite
+-- Created on Mon Sep 21 00:11:34 2009
+--
BEGIN TRANSACTION;
More information about the Bast-commits
mailing list