more dt docs reorg

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

diff --git a/t/746sybase.t b/t/746sybase.t
index 3a4ebb9..3cb0ca0 100644 (file)
--- a/t/746sybase.t
+++ b/t/746sybase.t
@@ -4,14 +4,14 @@ use warnings;
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
-use DBIx::Class::Storage::DBI::Sybase::DateTime;
+use DateTime::Format::Sybase;
 
 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 => (18 + 4*2)*2;
 
 my @storage_types = (
   'DBI::Sybase',
@@ -55,13 +55,17 @@ SQL
 
   $seen_id{$new->artistid}++;
 
-# 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}++;
   }
 
+# test simple count
+  is ($schema->resultset('Artist')->count, 7, 'count(*) of whole table ok');
+
+# test LIMIT support
+
 ## avoid quoting bug with NoBindVars for now
 #  my $it = $schema->resultset('Artist')->search({artistid => { '>' => 0 }}, {
 
@@ -77,21 +81,41 @@ SQL
   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';
+# now try with offset
+  $it = $schema->resultset('Artist')->search({}, {
+    rows => 3,
+    offset => 3,
+    order_by => 'artistid',
+  });
 
-# 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;
+  is( $it->count, 3, "LIMIT with offset count ok" );
 
-      eval { $schema->storage->dbh->do("DROP TABLE track") };
-      $schema->storage->dbh->do(<<"SQL");
+  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' );
+
+# 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,
@@ -99,20 +123,18 @@ CREATE TABLE track (
    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' );
-    }
+    ok(my $dt = DateTime::Format::Sybase->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' );
   }
 }