X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Finflate%2Fdatetime_mssql.t;h=cff0fba24d5b4c219f8e39db9a7b9165f03cf7d4;hb=56dca25f0e1582928ba897df4e1cf44c9710d4f2;hp=25524de7954a7355ec99f2f43c1223840939b701;hpb=0f72fb470be604ed2ab11a7d172b2657c3410385;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/inflate/datetime_mssql.t b/t/inflate/datetime_mssql.t
index 25524de..cff0fba 100644
--- a/t/inflate/datetime_mssql.t
+++ b/t/inflate/datetime_mssql.t
@@ -1,12 +1,15 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
 use Test::Exception;
 use Scope::Guard ();
+use Try::Tiny;
 use lib qw(t/lib);
 use DBICTest;
 
+DBICTest::Schema->load_classes('EventSmallDT');
+
 # use this if you keep a copy of DBD::Sybase linked to FreeTDS somewhere else
 BEGIN {
   if (my $lib_dirs = $ENV{DBICTEST_MSSQL_PERL5LIB}) {
@@ -14,28 +17,30 @@ BEGIN {
   }
 }
 
-my ($dsn, $user, $pass)    = @ENV{map { "DBICTEST_MSSQL_ODBC_${_}" } qw/DSN USER PASS/};
+my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_MSSQL_ODBC_${_}" } qw/DSN USER PASS/};
 my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_MSSQL_${_}" }      qw/DSN USER PASS/};
+my ($dsn3, $user3, $pass3) = @ENV{map { "DBICTEST_MSSQL_ADO_${_}" }  qw/DSN USER PASS/};
 
-if (not ($dsn || $dsn2)) {
+if (not ($dsn || $dsn2 || $dsn3)) {
   plan skip_all =>
-    'Set $ENV{DBICTEST_MSSQL_ODBC_DSN} and/or $ENV{DBICTEST_MSSQL_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::Strptime;";
-  if ($@) {
-    plan skip_all => 'needs DateTime and DateTime::Format::Strptime for testing';
-  }
+    'Set $ENV{DBICTEST_MSSQL_ODBC_DSN} and/or $ENV{DBICTEST_MSSQL_DSN} and/or '
+    .'$ENV{DBICTEST_MSSQL_ADO_DSN} _USER and _PASS to run this test' .
+    "\nWarning: This test drops and creates tables called 'event_small_dt' and"
+    ." 'track'.";
 }
 
+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 @connect_info = (
   [ $dsn,  $user,  $pass ],
   [ $dsn2, $user2, $pass2 ],
+  [ $dsn3, $user3, $pass3 ],
 );
 
 my $schema;
 
+SKIP:
 for my $connect_info (@connect_info) {
   my ($dsn, $user, $pass) = @$connect_info;
 
@@ -45,12 +50,42 @@ for my $connect_info (@connect_info) {
     on_connect_call => 'datetime_setup'
   });
 
+  {
+    my $w;
+    local $SIG{__WARN__} = sub { $w = shift };
+    $schema->storage->ensure_connected;
+    if ($w =~ /Your DBD::Sybase is too old to support DBIx::Class::InflateColumn::DateTime/) {
+      skip "Skipping tests on old DBD::Sybase " . DBD::Sybase->VERSION, 1;
+    }
+  }
+
   my $guard = Scope::Guard->new(\&cleanup);
 
-# coltype, column, datehash
+  # $^W because DBD::ADO is a piece of crap
+  try { local $^W = 0; $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_at DATETIME,
+)
+SQL
+  try { local $^W = 0; $schema->storage->dbh->do("DROP TABLE event_small_dt") };
+  $schema->storage->dbh->do(<<"SQL");
+CREATE TABLE event_small_dt (
+ id INT IDENTITY PRIMARY KEY,
+ small_dt SMALLDATETIME,
+)
+SQL
+
+# coltype, column, source, pk, create_extra, datehash
   my @dt_types = (
     ['DATETIME',
      'last_updated_at',
+     'Track',
+     'trackid',
+     { cd => 1 },
      {
       year => 2004,
       month => 8,
@@ -62,6 +97,9 @@ for my $connect_info (@connect_info) {
     }],
     ['SMALLDATETIME', # minute precision
      'small_dt',
+     'EventSmallDT',
+     'id',
+     {},
      {
       year => 2004,
       month => 8,
@@ -72,26 +110,19 @@ for my $connect_info (@connect_info) {
   );
 
   for my $dt_type (@dt_types) {
-    my ($type, $col, $sample_dt) = @$dt_type;
+    my ($type, $col, $source, $pk, $create_extra, $sample_dt) = @$dt_type;
+
+    delete $sample_dt->{nanosecond} if $dsn =~ /:ADO:/;
 
-    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->new($sample_dt));
 
     my $row;
-    ok( $row = $schema->resultset('Track')->create({
+    ok( $row = $schema->resultset($source)->create({
           $col => $dt,
-          cd => 1,
+          %$create_extra,
         }));
-    ok( $row = $schema->resultset('Track')
-      ->search({ trackid => $row->trackid }, { select => [$col] })
+    ok( $row = $schema->resultset($source)
+      ->search({ $pk => $row->$pk }, { select => [$col] })
       ->first
     );
     is( $row->$col, $dt, "$type roundtrip" );
@@ -108,5 +139,6 @@ done_testing;
 sub cleanup {
   if (my $dbh = eval { $schema->storage->dbh }) {
     $dbh->do('DROP TABLE track');
+    $dbh->do('DROP TABLE event_small_dt');
   }
 }