X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Finflate%2Fdatetime_oracle.t;h=98e4b537b42ea4eb94e5a52469997786ea7d0b48;hb=961d79dbe25ef8a92e867fcc84914b4bf568c11d;hp=af8c90b76ee281b0872ccc34c7007faef42d5858;hpb=199fbc453ec03891d0e156d7353c5e992ba4de47;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/inflate/datetime_oracle.t b/t/inflate/datetime_oracle.t
index af8c90b..98e4b53 100644
--- a/t/inflate/datetime_oracle.t
+++ b/t/inflate/datetime_oracle.t
@@ -14,7 +14,7 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_ORA_${_}" } qw/DSN USER PASS/};
 
 if (not ($dsn && $user && $pass)) {
     plan skip_all => 'Set $ENV{DBICTEST_ORA_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\'';
 }
 
 # DateTime::Format::Oracle needs this set
@@ -32,49 +32,53 @@ my $timestamp_datatype = ($schema->storage->_server_info->{normalized_dbms_versi
   : 'TIMESTAMP'
 ;
 
-# Need to redefine the last_updated_on column
-my $col_metadata = $schema->class('Track')->column_info('last_updated_on');
-$schema->class('Track')->add_column( 'last_updated_on' => {
-    data_type => 'date' });
-$schema->class('Track')->add_column( 'last_updated_at' => {
-    data_type => $timestamp_datatype });
-
 my $dbh = $schema->storage->dbh;
 
 #$dbh->do("alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SSXFF'");
 
 eval {
-  $dbh->do("DROP TABLE track");
+  $dbh->do("DROP TABLE event");
 };
-$dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12), position NUMBER(12), title VARCHAR(255), last_updated_on DATE, last_updated_at $timestamp_datatype)");
-
-TODO: {
+$dbh->do(<<EOS);
+  CREATE TABLE event (
+    id number NOT NULL,
+    starts_at date NOT NULL,
+    created_on $timestamp_datatype NOT NULL,
+    varchar_date varchar(20),
+    varchar_datetime varchar(20),
+    skip_inflation date,
+    ts_without_tz date,
+    PRIMARY KEY (id)
+  )
+EOS
+
+# TODO is in effect for the rest of the tests
 local $TODO = 'FIXME - something odd is going on with Oracle < 9 datetime support'
   if ($schema->storage->_server_info->{normalized_dbms_version}||0) < 9;
+
 lives_ok {
 
 # insert a row to play with
-my $new = $schema->resultset('Track')->create({ trackid => 1, cd => 1, position => 1, title => 'Track1', last_updated_on => '06-MAY-07', last_updated_at => '2009-05-03 21:17:18.5' });
-is($new->trackid, 1, "insert sucessful");
+my $new = $schema->resultset('Event')->create({ id => 1, starts_at => '06-MAY-07', created_on => '2009-05-03 21:17:18.5' });
+is($new->id, 1, "insert sucessful");
 
-my $track = $schema->resultset('Track')->find( 1 );
+my $event = $schema->resultset('Event')->find( 1 );
 
-is( ref($track->last_updated_on), 'DateTime', "last_updated_on inflated ok");
+is( ref($event->starts_at), 'DateTime', "starts_at inflated ok");
 
-is( $track->last_updated_on->month, 5, "DateTime methods work on inflated column");
+is( $event->starts_at->month, 5, "DateTime methods work on inflated column");
 
-#note '$track->last_updated_at => ', $track->last_updated_at;
-is( ref($track->last_updated_at), 'DateTime', "last_updated_at inflated ok");
+is( ref($event->created_on), 'DateTime', "created_on inflated ok");
 
-is( $track->last_updated_at->nanosecond, 500_000_000, "DateTime methods work with nanosecond precision");
+is( $event->created_on->nanosecond, 500_000_000, "DateTime methods work with nanosecond precision");
 
 my $dt = DateTime->now();
-$track->last_updated_on($dt);
-$track->last_updated_at($dt);
-$track->update;
+$event->starts_at($dt);
+$event->created_on($dt);
+$event->update;
 
-is( $track->last_updated_on->month, $dt->month, "deflate ok");
-is( int $track->last_updated_at->nanosecond, int $dt->nanosecond, "deflate ok with nanosecond precision");
+is( $event->starts_at->month, $dt->month, "deflate ok");
+is( int $event->created_on->nanosecond, int $dt->nanosecond, "deflate ok with nanosecond precision");
 
 # test datetime_setup
 
@@ -92,25 +96,26 @@ $dt = DateTime->now();
 my $timestamp = $dt->clone;
 $timestamp->set_nanosecond( int 500_000_000 );
 
-$track = $schema->resultset('Track')->find( 1 );
-$track->update({ last_updated_on => $dt, last_updated_at => $timestamp });
+$event = $schema->resultset('Event')->find( 1 );
+$event->update({ starts_at => $dt, created_on => $timestamp });
 
-$track = $schema->resultset('Track')->find(1);
+$event = $schema->resultset('Event')->find(1);
 
-is( $track->last_updated_on, $dt, 'DateTime round-trip as DATE' );
-is( $track->last_updated_at, $timestamp, 'DateTime round-trip as TIMESTAMP' );
+is( $event->starts_at, $dt, 'DateTime round-trip as DATE' );
+is( $event->created_on, $timestamp, 'DateTime round-trip as TIMESTAMP' );
 
-is( int $track->last_updated_at->nanosecond, int 500_000_000,
+is( int $event->created_on->nanosecond, int 500_000_000,
   'TIMESTAMP nanoseconds survived' );
 
-} 'dateteime operations executed correctly' } # end of lives_ok/TODO block
+} 'dateteime operations executed correctly';
 
 done_testing;
 
 # clean up our mess
 END {
-    if($schema && ($dbh = $schema->storage->dbh)) {
-        $dbh->do("DROP TABLE track");
-    }
+  if($schema && (my $dbh = $schema->storage->_dbh)) {
+    $dbh->do("DROP TABLE event");
+  }
+  undef $schema;
 }