[Bast-commits] r8520 - in DBIx-Class/0.08/trunk:
lib/DBIx/Class/Storage/DBI/ODBC t
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Wed Feb 3 04:19:59 GMT 2010
Author: caelum
Date: 2010-02-03 04:19:59 +0000 (Wed, 03 Feb 2010)
New Revision: 8520
Added:
DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/SQL_Anywhere.pm
Modified:
DBIx-Class/0.08/trunk/t/749sybase_asa.t
Log:
support for Sybase SQL Anywhere through ODBC
Added: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/SQL_Anywhere.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/SQL_Anywhere.pm (rev 0)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/SQL_Anywhere.pm 2010-02-03 04:19:59 UTC (rev 8520)
@@ -0,0 +1,28 @@
+package DBIx::Class::Storage::DBI::ODBC::SQL_Anywhere;
+
+use strict;
+use warnings;
+use base qw/DBIx::Class::Storage::DBI::SQLAnywhere/;
+use mro 'c3';
+
+1;
+
+=head1 NAME
+
+DBIx::Class::Storage::DBI::ODBC::SQL_Anywhere - Driver for using Sybase SQL
+Anywhere through ODBC
+
+=head1 SYNOPSIS
+
+All functionality is provided by L<DBIx::Class::Storage::DBI::SQLAnywhere>, see
+that module for details.
+
+=head1 AUTHOR
+
+See L<DBIx::Class/AUTHOR> and 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/t/749sybase_asa.t
===================================================================
--- DBIx-Class/0.08/trunk/t/749sybase_asa.t 2010-02-02 22:58:25 UTC (rev 8519)
+++ DBIx-Class/0.08/trunk/t/749sybase_asa.t 2010-02-03 04:19:59 UTC (rev 8520)
@@ -8,117 +8,135 @@
# tests stolen from 748informix.t
-my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_ASA_${_}" } qw/DSN USER PASS/};
+my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_ASA_${_}" } qw/DSN USER PASS/};
+my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_SYBASE_ASA_ODBC_${_}" } qw/DSN USER PASS/};
-plan skip_all => 'Set $ENV{DBICTEST_SYBASE_ASA_DSN}, _USER and _PASS to run this test'
- unless ($dsn);
+plan skip_all => <<"EOF" unless $dsn || $dsn2;
+Set $ENV{DBICTEST_SYBASE_ASA_DSN} and/or $ENV{DBICTEST_SYBASE_ASA_ODBC_DSN},
+_USER and _PASS to run these tests
+EOF
-my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
+my @info = (
+ [ $dsn, $user, $pass ],
+ [ $dsn2, $user2, $pass2 ],
+);
-my $dbh = $schema->storage->dbh;
+my @handles_to_clean;
-eval { $dbh->do("DROP TABLE artist") };
+foreach my $info (@info) {
+ my ($dsn, $user, $pass) = @$info;
-$dbh->do(<<EOF);
-CREATE TABLE artist (
- artistid INT IDENTITY PRIMARY KEY,
- name VARCHAR(255) NULL,
- charfield CHAR(10) NULL,
- rank INT DEFAULT 13
-)
+ next unless $dsn;
+
+ my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
+
+ my $dbh = $schema->storage->dbh;
+
+ push @handles_to_clean, $dbh;
+
+ eval { $dbh->do("DROP TABLE artist") };
+
+ $dbh->do(<<EOF);
+ CREATE TABLE artist (
+ artistid INT IDENTITY PRIMARY KEY,
+ name VARCHAR(255) NULL,
+ charfield CHAR(10) NULL,
+ rank INT DEFAULT 13
+ )
EOF
-my $ars = $schema->resultset('Artist');
-is ( $ars->count, 0, 'No rows at first' );
+ my $ars = $schema->resultset('Artist');
+ is ( $ars->count, 0, 'No rows at first' );
# test primary key handling
-my $new = $ars->create({ name => 'foo' });
-ok($new->artistid, "Auto-PK worked");
+ my $new = $ars->create({ name => 'foo' });
+ ok($new->artistid, "Auto-PK worked");
# test explicit key spec
-$new = $ars->create ({ name => 'bar', artistid => 66 });
-is($new->artistid, 66, 'Explicit PK worked');
-$new->discard_changes;
-is($new->artistid, 66, 'Explicit PK assigned');
+ $new = $ars->create ({ name => 'bar', artistid => 66 });
+ is($new->artistid, 66, 'Explicit PK worked');
+ $new->discard_changes;
+ is($new->artistid, 66, 'Explicit PK assigned');
# test populate
-lives_ok (sub {
- my @pop;
- for (1..2) {
- push @pop, { name => "Artist_$_" };
- }
- $ars->populate (\@pop);
-});
+ lives_ok (sub {
+ my @pop;
+ for (1..2) {
+ push @pop, { name => "Artist_$_" };
+ }
+ $ars->populate (\@pop);
+ });
# test populate with explicit key
-lives_ok (sub {
- my @pop;
- for (1..2) {
- push @pop, { name => "Artist_expkey_$_", artistid => 100 + $_ };
- }
- $ars->populate (\@pop);
-});
+ lives_ok (sub {
+ my @pop;
+ for (1..2) {
+ push @pop, { name => "Artist_expkey_$_", artistid => 100 + $_ };
+ }
+ $ars->populate (\@pop);
+ });
# count what we did so far
-is ($ars->count, 6, 'Simple count works');
+ is ($ars->count, 6, 'Simple count works');
# test LIMIT support
-my $lim = $ars->search( {},
- {
- rows => 3,
- offset => 4,
- order_by => 'artistid'
- }
-);
-is( $lim->count, 2, 'ROWS+OFFSET count ok' );
-is( $lim->all, 2, 'Number of ->all objects matches count' );
+ my $lim = $ars->search( {},
+ {
+ rows => 3,
+ offset => 4,
+ order_by => 'artistid'
+ }
+ );
+ is( $lim->count, 2, 'ROWS+OFFSET count ok' );
+ is( $lim->all, 2, 'Number of ->all objects matches count' );
# test iterator
-$lim->reset;
-is( $lim->next->artistid, 101, "iterator->next ok" );
-is( $lim->next->artistid, 102, "iterator->next ok" );
-is( $lim->next, undef, "next past end of resultset ok" );
+ $lim->reset;
+ is( $lim->next->artistid, 101, "iterator->next ok" );
+ is( $lim->next->artistid, 102, "iterator->next ok" );
+ is( $lim->next, undef, "next past end of resultset ok" );
# test empty insert
-{
- local $ars->result_source->column_info('artistid')->{is_auto_increment} = 0;
+ {
+ local $ars->result_source->column_info('artistid')->{is_auto_increment} = 0;
- lives_ok { $ars->create({}) }
- 'empty insert works';
-}
+ lives_ok { $ars->create({}) }
+ 'empty insert works';
+ }
# test blobs (stolen from 73oracle.t)
-eval { $dbh->do('DROP TABLE bindtype_test') };
-$dbh->do(qq[
-CREATE TABLE bindtype_test
-(
- id INT NOT NULL PRIMARY KEY,
- bytea INT NULL,
- blob LONG BINARY NULL,
- clob LONG VARCHAR NULL
-)
-],{ RaiseError => 1, PrintError => 1 });
+ eval { $dbh->do('DROP TABLE bindtype_test') };
+ $dbh->do(qq[
+ CREATE TABLE bindtype_test
+ (
+ id INT NOT NULL PRIMARY KEY,
+ bytea INT NULL,
+ blob LONG BINARY NULL,
+ clob LONG VARCHAR NULL
+ )
+ ],{ RaiseError => 1, PrintError => 1 });
-my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
-$binstr{'large'} = $binstr{'small'} x 1024;
+ my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
+ $binstr{'large'} = $binstr{'small'} x 1024;
-my $maxloblen = length $binstr{'large'};
-local $dbh->{'LongReadLen'} = $maxloblen;
+ my $maxloblen = length $binstr{'large'};
+ local $dbh->{'LongReadLen'} = $maxloblen;
-my $rs = $schema->resultset('BindType');
-my $id = 0;
+ my $rs = $schema->resultset('BindType');
+ my $id = 0;
-foreach my $type (qw( blob clob )) {
- foreach my $size (qw( small large )) {
- $id++;
+ foreach my $type (qw( blob clob )) {
+ foreach my $size (qw( small large )) {
+ $id++;
# turn off horrendous binary DBIC_TRACE output
- local $schema->storage->{debug} = 0;
+ local $schema->storage->{debug} = 0;
- lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) }
- "inserted $size $type without dying";
+ lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) }
+ "inserted $size $type without dying";
- ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" );
+ ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" );
+ }
}
}
@@ -126,7 +144,7 @@
# clean up our mess
END {
- if (my $dbh = eval { $schema->storage->_dbh }) {
- $dbh->do("DROP TABLE $_") for qw/artist bindtype_test/;
+ foreach my $dbh (@handles_to_clean) {
+ eval { $dbh->do("DROP TABLE $_") } for qw/artist bindtype_test/;
}
}
More information about the Bast-commits
mailing list