X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle.t;h=f565de99293303ba4d27a980456804bee37cddd1;hb=166c656193b56e08b472c675e92b9076aac03a53;hp=0e250c27d4708499a78cff583131c37329de43f2;hpb=d2a3958e111673a0fd1a8f3a6d81700e5d351140;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/t/73oracle.t b/t/73oracle.t index 0e250c2..f565de9 100644 --- a/t/73oracle.t +++ b/t/73oracle.t @@ -32,7 +32,6 @@ use Test::Exception; use Test::More; use lib qw(t/lib); use DBICTest; -use DateTime; my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_ORA_${_}" } qw/DSN USER PASS/}; @@ -41,12 +40,10 @@ plan skip_all => 'Set $ENV{DBICTEST_ORA_DSN}, _USER and _PASS to run this test. ' as well as following sequences: \'pkid1_seq\', \'pkid2_seq\' and \'nonpkid_seq\'' unless ($dsn && $user && $pass); -plan tests => 36; +plan tests => 35; DBICTest::Schema->load_classes('ArtistFQN'); -my $schema = DBICTest::Schema->connect($dsn, $user, $pass, { - on_connect_call => 'set_datetime_format' -}); +my $schema = DBICTest::Schema->connect($dsn, $user, $pass); my $dbh = $schema->storage->dbh; @@ -67,7 +64,7 @@ $dbh->do("CREATE SEQUENCE nonpkid_seq START WITH 20 MAXVALUE 999999 MINVALUE 0") $dbh->do("CREATE TABLE artist (artistid NUMBER(12), name VARCHAR(255), rank NUMBER(38), charfield VARCHAR2(10))"); $dbh->do("CREATE TABLE sequence_test (pkid1 NUMBER(12), pkid2 NUMBER(12), nonpkid NUMBER(12), name VARCHAR(255))"); $dbh->do("CREATE TABLE cd (cdid NUMBER(12), artist NUMBER(12), title VARCHAR(255), year VARCHAR(4))"); -$dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12), position NUMBER(12), title VARCHAR(255), last_updated_on DATE, last_updated_at DATE)"); +$dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12), position NUMBER(12), title VARCHAR(255), last_updated_on DATE, last_updated_at DATE, small_dt DATE)"); $dbh->do("ALTER TABLE artist ADD (CONSTRAINT artist_pk PRIMARY KEY (artistid))"); $dbh->do("ALTER TABLE sequence_test ADD (CONSTRAINT sequence_test_constraint PRIMARY KEY (pkid1, pkid2))"); @@ -115,13 +112,11 @@ is($new->artistid, 1, "Oracle Auto-PK worked"); $new = $schema->resultset('ArtistFQN')->create( { name => 'bar' } ); is( $new->artistid, 2, "Oracle Auto-PK worked with fully-qualified tablename" ); -# test join with row count ambiguity, and DateTime inflation - -my $dt = DateTime->now; +# test join with row count ambiguity my $cd = $schema->resultset('CD')->create({ cdid => 1, artist => 1, title => 'EP C', year => '2003' }); my $track = $schema->resultset('Track')->create({ trackid => 1, cd => 1, - position => 1, title => 'Track1', last_updated_on => $dt }); + position => 1, title => 'Track1' }); my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'}, { join => 'cd', rows => 2 } @@ -130,7 +125,6 @@ my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'}, ok(my $row = $tjoin->next); is($row->title, 'Track1', "ambiguous column ok"); -is($row->updated_date, $dt, "DateTime inflation/deflation ok"); # check count distinct with multiple columns my $other_track = $schema->resultset('Track')->create({ trackid => 2, cd => 1, position => 1, title => 'Track2' });