X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Finflate%2Fdatetime_sqlanywhere.t;h=6788f874fa51c7f970fdb46c8a22528037cf014f;hb=199fbc453ec03891d0e156d7353c5e992ba4de47;hp=b74e7882addb58b6e40d5cfe92f62ca7611ed57c;hpb=374f18f2c8a02a33c4c39d7decb12103463c4e46;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/inflate/datetime_sqlanywhere.t b/t/inflate/datetime_sqlanywhere.t
index b74e788..6788f87 100644
--- a/t/inflate/datetime_sqlanywhere.t
+++ b/t/inflate/datetime_sqlanywhere.t
@@ -4,23 +4,34 @@ use warnings;
 use Test::More;
 use Test::Exception;
 use Scope::Guard ();
+use DBIx::Class::Optional::Dependencies ();
 use lib qw(t/lib);
 use DBICTest;
 
 my ($dsn, $user, $pass)    = @ENV{map { "DBICTEST_SQLANYWHERE_${_}" }      qw/DSN USER PASS/};
 my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_SQLANYWHERE_ODBC_${_}" } qw/DSN USER PASS/};
 
+plan skip_all => 'Test needs ' .
+  (join ' and ', map { $_ ? $_ : () }
+    DBIx::Class::Optional::Dependencies->req_missing_for('test_dt'),
+    (join ' or ', map { $_ ? $_ : () }
+      DBIx::Class::Optional::Dependencies->req_missing_for('test_rdbms_sqlanywhere'),
+      DBIx::Class::Optional::Dependencies->req_missing_for('test_rdbms_sqlanywhere_odbc')))
+  unless
+    DBIx::Class::Optional::Dependencies->req_ok_for ('test_dt') && (
+    $dsn && DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_sqlanywhere')
+    or
+    $dsn2 && DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_sqlanywhere_odbc'))
+      or (not $dsn || $dsn2);
+
 if (not ($dsn || $dsn2)) {
   plan skip_all => <<'EOF';
 Set $ENV{DBICTEST_SQLANYWHERE_DSN} and/or $ENV{DBICTEST_SQLANYWHERE_ODBC_DSN}
 _USER and _PASS to run this test'.
-Warning: This test drops and creates a table called 'track'";
+Warning: This test drops and creates a table called 'event'";
 EOF
 }
 
-plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_dt')
-  unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_dt');
-
 my @info = (
   [ $dsn,  $user,  $pass  ],
   [ $dsn2, $user2, $pass2 ],
@@ -36,39 +47,44 @@ foreach my $info (@info) {
   $schema = DBICTest::Schema->clone;
 
   $schema->connection($dsn, $user, $pass, {
-    on_connect_call => [ 'datetime_setup' ],
+    on_connect_call => 'datetime_setup',
   });
 
   my $sg = Scope::Guard->new(\&cleanup); 
 
+  eval { $schema->storage->dbh->do('DROP TABLE event') };
+  $schema->storage->dbh->do(<<"SQL");
+  CREATE TABLE event (
+    id INT IDENTITY PRIMARY KEY,
+    created_on TIMESTAMP,
+    starts_at DATE
+  )
+SQL
+
 # coltype, col, date
   my @dt_types = (
-    ['TIMESTAMP', 'last_updated_at', '2004-08-21 14:36:48.080445'],
+    [
+      'TIMESTAMP',
+      'created_on',
+      '2004-08-21 14:36:48.080445',
+    ],
 # date only (but minute precision according to ASA docs)
-    ['DATE', 'small_dt', '2004-08-21 00:00:00.000000'],
+    [
+      'DATE',
+      'starts_at',
+      '2004-08-21 00:00:00.000000',
+    ],
   );
 
   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 = $schema->storage->datetime_parser->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] })
+    ok( $row = $schema->resultset('Event')->create({ $col => $dt, }));
+    ok( $row = $schema->resultset('Event')
+      ->search({ id => $row->id }, { select => [$col] })
       ->first
     );
     is( $row->$col, $dt, "$type roundtrip" );
@@ -83,6 +99,6 @@ done_testing;
 # clean up our mess
 sub cleanup {
   if (my $dbh = $schema->storage->dbh) {
-    eval { $dbh->do("DROP TABLE $_") } for qw/track/;
+    eval { $dbh->do("DROP TABLE $_") } for qw/event/;
   }
 }