fixed multiple column count distincts in SQLite and Oracle

[dbsrgits/DBIx-Class.git] / t / run / 13oracle.tl

diff --git a/t/run/13oracle.tl b/t/run/13oracle.tl
index d524b96..f38b767 100644 (file)
--- a/t/run/13oracle.tl
+++ b/t/run/13oracle.tl
@@ -1,23 +1,29 @@
 sub run_tests {
+my $schema = shift;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_ORA_${_}" } qw/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 \'artist\''
+  'Warning: This test drops and creates tables called \'artist\', \'cd\' and \'track\''
   unless ($dsn && $user && $pass);
 
-plan tests => 4;
+plan tests => 6;
 
 DBICTest::Schema->compose_connection('OraTest' => $dsn, $user, $pass);
 
-my $dbh = OraTest::Artist->storage->dbh;
+my $dbh = OraTest->schema->storage->dbh;
 
 eval {
   $dbh->do("DROP SEQUENCE artist_seq");
   $dbh->do("DROP TABLE artist");
+  $dbh->do("DROP TABLE cd");
+  $dbh->do("DROP TABLE track");
 };
 $dbh->do("CREATE SEQUENCE artist_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
 $dbh->do("CREATE TABLE artist (artistid 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))");
+
 $dbh->do("ALTER TABLE artist ADD (CONSTRAINT artist_pk PRIMARY KEY (artistid))");
 $dbh->do(qq{
   CREATE OR REPLACE TRIGGER artist_insert_trg
@@ -32,12 +38,36 @@ $dbh->do(qq{
   END;
 });
 
-OraTest::Artist->load_components('PK::Auto::Oracle');
+OraTest::Artist->load_components('PK::Auto');
+OraTest::CD->load_components('PK::Auto::Oracle');
+OraTest::Track->load_components('PK::Auto::Oracle');
 
 # test primary key handling
 my $new = OraTest::Artist->create({ name => 'foo' });
 is($new->artistid, 1, "Oracle Auto-PK worked");
 
+# test join with row count ambiguity
+my $cd = OraTest::CD->create({ cdid => 1, artist => 1, title => 'EP C', year => '2003' });
+my $track = OraTest::Track->create({ trackid => 1, cd => 1, position => 1, title => 'Track1' });
+my $tjoin = OraTest::Track->search({ 'me.title' => 'Track1'},
+        { join => 'cd',
+          rows => 2 }
+);
+
+is($tjoin->next->title, 'Track1', "ambiguous column ok");
+
+# check count distinct with multiple columns
+my $other_track = OraTest::Track->create({ trackid => 2, cd => 1, position => 1, title => 'Track2' });
+my $tcount = OraTest::Track->search(
+    {},
+    {
+       select => [{count => {distinct => ['position', 'title']}}],
+       as => ['count']
+    }
+  );
+
+is($tcount->next->get_column('count'), 2, "multiple column select distinct ok");
+
 # test LIMIT support
 for (1..6) {
     OraTest::Artist->create({ name => 'Artist ' . $_ });
@@ -56,6 +86,8 @@ is( $it->next, undef, "next past end of resultset ok" );
 # clean up our mess
 $dbh->do("DROP SEQUENCE artist_seq");
 $dbh->do("DROP TABLE artist");
+$dbh->do("DROP TABLE cd");
+$dbh->do("DROP TABLE track");
 
 }