Backout sybase changes

[dbsrgits/DBIx-Class.git] / t / 746sybase.t

diff --git a/t/746sybase.t b/t/746sybase.t
index 47064af..677d78a 100644 (file)
--- a/t/746sybase.t
+++ b/t/746sybase.t
@@ -1,126 +1,91 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
+use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
-use DBIx::Class::Storage::DBI::Sybase::DateTime;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_${_}" } qw/DSN USER PASS/};
 
 plan skip_all => 'Set $ENV{DBICTEST_SYBASE_DSN}, _USER and _PASS to run this test'
   unless ($dsn && $user);
 
-plan tests => 20*2;
+plan tests => 13;
 
-my @storage_types = (
-  'DBI::Sybase',
-  'DBI::Sybase::NoBindVars',
-);
-my $schema;
+my $schema = DBICTest::Schema->connect($dsn, $user, $pass, {AutoCommit => 1});
 
-for my $storage_type (@storage_types) {
-  $schema = DBICTest::Schema->clone;
+# start disconnected to test reconnection
+$schema->storage->ensure_connected;
+$schema->storage->_dbh->disconnect;
 
-  unless ($storage_type eq 'DBI::Sybase') { # autodetect
-    $schema->storage_type("::$storage_type");
-  }
-  $schema->connection($dsn, $user, $pass, {AutoCommit => 1});
+isa_ok( $schema->storage, 'DBIx::Class::Storage::DBI::Sybase' );
 
-  $schema->storage->ensure_connected;
+my $dbh;
+lives_ok (sub {
+  $dbh = $schema->storage->dbh;
+}, 'reconnect works');
 
-  isa_ok( $schema->storage, "DBIx::Class::Storage::$storage_type" );
+$schema->storage->dbh_do (sub {
+    my ($storage, $dbh) = @_;
+    eval { $dbh->do("DROP TABLE artist") };
+    $dbh->do(<<'SQL');
 
-  $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;
+});
+
+my %seen_id;
 
-# so we start unconnected
-  $schema->storage->disconnect;
+# 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}++;
 
 # test LIMIT support
-  for (1..6) {
+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}++;
-  }
+}
 
-  my $it = $schema->resultset('Artist')->search( {}, {
+my $it;
+
+$it = $schema->resultset('Artist')->search( {}, {
     rows => 3,
     order_by => 'artistid',
-  });
+});
 
-  TODO: {
+TODO: {
     local $TODO = 'Sybase is very very fucked in the limit department';
 
     is( $it->count, 3, "LIMIT 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" );
-
-  SKIP: {
-    skip 'quoting bug with NoBindVars', 8
-        if $storage_type eq 'DBI::Sybase::NoBindVars';
-
-# Test DateTime inflation with DATETIME
-    my @dt_types = (
-      ['DATETIME', '2004-08-21T14:36:48.080Z'],
-      ['SMALLDATETIME', '2004-08-21T14:36:00.000Z'], # minute precision
-    );
-    
-    for my $dt_type (@dt_types) {
-      my ($type, $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,
-   last_updated_on $type,
-)
-SQL
-      ok(my $dt = DBIx::Class::Storage::DBI::Sybase::DateTime
-        ->parse_datetime($sample_dt));
-
-      my $row;
-      ok( $row = $schema->resultset('Track')->create({
-        last_updated_on => $dt,
-        cd => 1,
-      }));
-      ok( $row = $schema->resultset('Track')
-        ->search({ trackid => $row->trackid }, { select => ['last_updated_on'] })
-        ->first
-      );
-      is( $row->updated_date, $dt, 'DateTime inflation works' );
-    }
-  }
 }
 
+# The iterator still works correctly with rows => 3, even though the sql is
+# fucked, very interesting.
+
+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" );
+
+
 # clean up our mess
 END {
-  if (my $dbh = eval { $schema->storage->_dbh }) {
-    $dbh->do('DROP TABLE artist');
-    $dbh->do('DROP TABLE track');
-  }
+    my $dbh = eval { $schema->storage->_dbh };
+    $dbh->do('DROP TABLE artist') if $dbh;
 }
+