X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle.t;h=daade011468eb859620ec702c82e8c226a1846b4;hb=720448921cee676e52ed7e7b37c17352ea9b8470;hp=5dcd56750fecf919f091238d27d578b648bf1596;hpb=9a5a7d7ecc726756d50c0b0ec36ee58f5e4ef38a;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/73oracle.t b/t/73oracle.t
index 5dcd567..daade01 100644
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -35,7 +35,10 @@ use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
-my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_ORA_${_}" } qw/DSN USER PASS/};
+my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_ORA_${_}" }  qw/DSN USER PASS/};
+
+# optional:
+my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_ORA_EXTRAUSER_${_}" } 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 tables called \'artist\', \'cd\', \'track\' and \'sequence_test\''.
@@ -47,85 +50,7 @@ my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 
 my $dbh = $schema->storage->dbh;
 
-eval {
-  $dbh->do("DROP SEQUENCE artist_seq");
-  $dbh->do("DROP SEQUENCE cd_seq");
-  $dbh->do("DROP SEQUENCE track_seq");
-  $dbh->do("DROP SEQUENCE pkid1_seq");
-  $dbh->do("DROP SEQUENCE pkid2_seq");
-  $dbh->do("DROP SEQUENCE nonpkid_seq");
-  $dbh->do("DROP TABLE artist");
-  $dbh->do("DROP TABLE sequence_test");
-  $dbh->do("DROP TABLE track");
-  $dbh->do("DROP TABLE cd");
-};
-$dbh->do("CREATE SEQUENCE artist_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
-$dbh->do("CREATE SEQUENCE cd_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
-$dbh->do("CREATE SEQUENCE track_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
-$dbh->do("CREATE SEQUENCE pkid1_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
-$dbh->do("CREATE SEQUENCE pkid2_seq START WITH 10 MAXVALUE 999999 MINVALUE 0");
-$dbh->do("CREATE SEQUENCE nonpkid_seq START WITH 20 MAXVALUE 999999 MINVALUE 0");
-
-$dbh->do("CREATE TABLE artist (artistid NUMBER(12), parentid NUMBER(12), name VARCHAR(255), rank NUMBER(38), charfield VARCHAR2(10))");
-$dbh->do("ALTER TABLE artist ADD (CONSTRAINT artist_pk PRIMARY KEY (artistid))");
-
-$dbh->do("CREATE TABLE sequence_test (pkid1 NUMBER(12), pkid2 NUMBER(12), nonpkid NUMBER(12), name VARCHAR(255))");
-$dbh->do("ALTER TABLE sequence_test ADD (CONSTRAINT sequence_test_constraint PRIMARY KEY (pkid1, pkid2))");
-
-$dbh->do("CREATE TABLE cd (cdid NUMBER(12), artist NUMBER(12), title VARCHAR(255), year VARCHAR(4), genreid NUMBER(12), single_track NUMBER(12))");
-$dbh->do("ALTER TABLE cd ADD (CONSTRAINT cd_pk PRIMARY KEY (cdid))");
-
-$dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12) REFERENCES cd(cdid) DEFERRABLE, position NUMBER(12), title VARCHAR(255), last_updated_on DATE, last_updated_at DATE, small_dt DATE)");
-$dbh->do("ALTER TABLE track ADD (CONSTRAINT track_pk PRIMARY KEY (trackid))");
-
-$dbh->do(qq{
-  CREATE OR REPLACE TRIGGER artist_insert_trg
-  BEFORE INSERT ON artist
-  FOR EACH ROW
-  BEGIN
-    IF :new.artistid IS NULL THEN
-      SELECT artist_seq.nextval
-      INTO :new.artistid
-      FROM DUAL;
-    END IF;
-  END;
-});
-$dbh->do(qq{
-  CREATE OR REPLACE TRIGGER cd_insert_trg
-  BEFORE INSERT ON cd
-  FOR EACH ROW
-  BEGIN
-    IF :new.cdid IS NULL THEN
-      SELECT cd_seq.nextval
-      INTO :new.cdid
-      FROM DUAL;
-    END IF;
-  END;
-});
-$dbh->do(qq{
-  CREATE OR REPLACE TRIGGER cd_insert_trg
-  BEFORE INSERT ON cd
-  FOR EACH ROW
-  BEGIN
-    IF :new.cdid IS NULL THEN
-      SELECT cd_seq.nextval
-      INTO :new.cdid
-      FROM DUAL;
-    END IF;
-  END;
-});
-$dbh->do(qq{
-  CREATE OR REPLACE TRIGGER track_insert_trg
-  BEFORE INSERT ON track
-  FOR EACH ROW
-  BEGIN
-    IF :new.trackid IS NULL THEN
-      SELECT track_seq.nextval
-      INTO :new.trackid
-      FROM DUAL;
-    END IF;
-  END;
-});
+do_creates($dbh);
 
 {
     # Swiped from t/bindtype_columns.t to avoid creating my own Resultset.
@@ -251,6 +176,18 @@ is( $it->next, undef, "next past end of resultset ok" );
   is( scalar @results, 1, "Group by with limit OK" );
 }
 
+# test identifiers over the 30 char limit
+{
+  lives_ok {
+    my @results = $schema->resultset('CD')->search(undef, {
+      prefetch => 'very_long_artist_relationship',
+      rows => 3,
+      offset => 0,
+    })->all;
+    ok( scalar @results > 0, 'limit with long identifiers returned something');
+  } 'limit with long identifiers executed successfully';
+}
+
 # test with_deferred_fk_checks
 lives_ok {
   $schema->storage->with_deferred_fk_checks(sub {
@@ -343,13 +280,16 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
 
     $schema->resultset('Artist')->create ({
         name => 'root',
+        rank => 1,
         cds => [],
         children => [
             {
                 name => 'child1',
+                rank => 2,
                 children => [
                     {
                         name => 'grandchild',
+                        rank => 3,
                         cds => [
                             {
                                 title => "grandchilds's cd" ,
@@ -365,6 +305,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
                         children => [
                             {
                                 name => 'greatgrandchild',
+                                rank => 3,
                             }
                         ],
                     }
@@ -372,6 +313,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
             },
             {
                 name => 'child2',
+                rank => 3,
             },
         ],
     });
@@ -601,29 +543,58 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
       # after count_subq, 
       # I will fix this later...
       # 
-      # is_same_sql_bind (
-      #   $rs->count_rs->as_query,
-      #   '( 
-      #       SELECT COUNT( * ) FROM (
-      #           SELECT * FROM (
-      #               SELECT A.*, ROWNUM r FROM (
-      #                   SELECT 
-      #                       me.artistid AS col1 
-      #                   FROM artist me 
-      #                   START WITH name = ? 
-      #                   CONNECT BY artistid = PRIOR parentid 
-      #               ) A
-      #               WHERE ROWNUM < 3
-      #           ) B
-      #           WHERE r >= 1
-      #       ) count_subq 
-      #   )',
-      #   [ [ name => 'greatgrandchild' ] ],
-      # );
-      # 
-      # is( $rs->count, 2, 'Connect By; LIMIT count ok' );
+      is_same_sql_bind (
+        $rs->count_rs->as_query,
+        '( 
+            SELECT COUNT( * ) FROM (
+                SELECT artistid FROM (
+                    SELECT artistid, ROWNUM rownum__index FROM (
+                        SELECT 
+                            me.artistid
+                        FROM artist me 
+                        START WITH name = ? 
+                        CONNECT BY parentid = PRIOR artistid
+                    ) me
+                ) me 
+                WHERE rownum__index BETWEEN 1 AND 2
+            ) me
+        )',
+        [ [ name => 'root' ] ],
+      );
+
+      is( $rs->count, 2, 'Connect By; LIMIT count ok' );
+    }
+
+    # combine a connect_by with group_by and having
+    {
+      my $rs = $schema->resultset('Artist')->search({}, {
+        select => ['count(rank)'],
+        start_with => { name => 'root' },
+        connect_by => { parentid => { -prior => \ 'artistid' } },
+        group_by => ['rank'],
+        having => { 'count(rank)' => { '<', 2 } },
+      });
+
+      is_same_sql_bind (
+        $rs->as_query,
+        '(
+            SELECT count(rank)
+            FROM artist me
+            START WITH name = ?
+            CONNECT BY parentid = PRIOR artistid
+            GROUP BY rank HAVING count(rank) < ?
+        )',
+        [ [ name => 'root' ], [ 'count(rank)' => 2 ] ],
+      );
+
+      is_deeply (
+        [ $rs->get_column ('count(rank)')->all ],
+        [1, 1],
+        'Group By a Connect By query - correct values'
+      );
     }
 
+
     # select the whole cycle tree without nocylce
     {
       my $rs = $schema->resultset('Artist')->search({}, {
@@ -641,10 +612,9 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
     # select the whole cycle tree with nocylce
     {
       my $rs = $schema->resultset('Artist')->search({}, {
-        nocycle    => 1,
         start_with => { name => 'cycle-root' },
         '+select'  => [ \ 'CONNECT_BY_ISCYCLE' ],
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by_nocycle => { parentid => { -prior => \ 'artistid' } },
       });
 
       is_same_sql_bind (
@@ -684,22 +654,162 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
     }
 }
 
+my $schema2;
+
+# test sequence detection from a different schema
+SKIP: {
+  skip ((join '',
+'Set DBICTEST_ORA_EXTRAUSER_DSN, _USER and _PASS to a *DIFFERENT* Oracle user',
+' to run the cross-schema autoincrement test.'),
+    1) unless $dsn2 && $user2 && $user2 ne $user;
+
+  $schema2 = DBICTest::Schema->connect($dsn2, $user2, $pass2);
+
+  my $schema1_dbh  = $schema->storage->dbh;
+
+  $schema1_dbh->do("GRANT INSERT ON artist TO $user2");
+  $schema1_dbh->do("GRANT SELECT ON artist_seq TO $user2");
+
+  my $rs = $schema2->resultset('ArtistFQN');
+
+  # first test with unquoted (default) sequence name in trigger body
+
+  lives_and {
+    my $row = $rs->create({ name => 'From Different Schema' });
+    ok $row->artistid;
+  } 'used autoinc sequence across schemas';
+
+  # now quote the sequence name
+
+  $schema1_dbh->do(qq{
+    CREATE OR REPLACE TRIGGER artist_insert_trg
+    BEFORE INSERT ON artist
+    FOR EACH ROW
+    BEGIN
+      IF :new.artistid IS NULL THEN
+        SELECT "ARTIST_SEQ".nextval
+        INTO :new.artistid
+        FROM DUAL;
+      END IF;
+    END;
+  });
+
+  # sequence is cached in the rsrc
+  delete $rs->result_source->column_info('artistid')->{sequence};
+
+  lives_and {
+    my $row = $rs->create({ name => 'From Different Schema With Quoted Sequence' });
+    ok $row->artistid;
+  } 'used quoted autoinc sequence across schemas';
+
+  my $schema_name = uc $user;
+
+  is $rs->result_source->column_info('artistid')->{sequence},
+    qq[${schema_name}."ARTIST_SEQ"],
+    'quoted sequence name correctly extracted';
+}
+
 done_testing;
 
+sub do_creates {
+  my $dbh = shift;
+
+  eval {
+    $dbh->do("DROP SEQUENCE artist_seq");
+    $dbh->do("DROP SEQUENCE cd_seq");
+    $dbh->do("DROP SEQUENCE track_seq");
+    $dbh->do("DROP SEQUENCE pkid1_seq");
+    $dbh->do("DROP SEQUENCE pkid2_seq");
+    $dbh->do("DROP SEQUENCE nonpkid_seq");
+    $dbh->do("DROP TABLE artist");
+    $dbh->do("DROP TABLE sequence_test");
+    $dbh->do("DROP TABLE track");
+    $dbh->do("DROP TABLE cd");
+  };
+  $dbh->do("CREATE SEQUENCE artist_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE cd_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE track_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE pkid1_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE pkid2_seq START WITH 10 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE nonpkid_seq START WITH 20 MAXVALUE 999999 MINVALUE 0");
+
+  $dbh->do("CREATE TABLE artist (artistid NUMBER(12), parentid NUMBER(12), name VARCHAR(255), rank NUMBER(38), charfield VARCHAR2(10))");
+  $dbh->do("ALTER TABLE artist ADD (CONSTRAINT artist_pk PRIMARY KEY (artistid))");
+
+  $dbh->do("CREATE TABLE sequence_test (pkid1 NUMBER(12), pkid2 NUMBER(12), nonpkid NUMBER(12), name VARCHAR(255))");
+  $dbh->do("ALTER TABLE sequence_test ADD (CONSTRAINT sequence_test_constraint PRIMARY KEY (pkid1, pkid2))");
+
+  $dbh->do("CREATE TABLE cd (cdid NUMBER(12), artist NUMBER(12), title VARCHAR(255), year VARCHAR(4), genreid NUMBER(12), single_track NUMBER(12))");
+  $dbh->do("ALTER TABLE cd ADD (CONSTRAINT cd_pk PRIMARY KEY (cdid))");
+
+  $dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12) REFERENCES cd(cdid) DEFERRABLE, position NUMBER(12), title VARCHAR(255), last_updated_on DATE, last_updated_at DATE, small_dt DATE)");
+  $dbh->do("ALTER TABLE track ADD (CONSTRAINT track_pk PRIMARY KEY (trackid))");
+
+  $dbh->do(qq{
+    CREATE OR REPLACE TRIGGER artist_insert_trg
+    BEFORE INSERT ON artist
+    FOR EACH ROW
+    BEGIN
+      IF :new.artistid IS NULL THEN
+        SELECT artist_seq.nextval
+        INTO :new.artistid
+        FROM DUAL;
+      END IF;
+    END;
+  });
+  $dbh->do(qq{
+    CREATE OR REPLACE TRIGGER cd_insert_trg
+    BEFORE INSERT OR UPDATE ON cd
+    FOR EACH ROW
+    BEGIN
+      IF :new.cdid IS NULL THEN
+        SELECT cd_seq.nextval
+        INTO :new.cdid
+        FROM DUAL;
+      END IF;
+    END;
+  });
+  $dbh->do(qq{
+    CREATE OR REPLACE TRIGGER cd_insert_trg
+    BEFORE INSERT ON cd
+    FOR EACH ROW
+    BEGIN
+      IF :new.cdid IS NULL THEN
+        SELECT cd_seq.nextval
+        INTO :new.cdid
+        FROM DUAL;
+      END IF;
+    END;
+  });
+  $dbh->do(qq{
+    CREATE OR REPLACE TRIGGER track_insert_trg
+    BEFORE INSERT ON track
+    FOR EACH ROW
+    BEGIN
+      IF :new.trackid IS NULL THEN
+        SELECT track_seq.nextval
+        INTO :new.trackid
+        FROM DUAL;
+      END IF;
+    END;
+  });
+}
+
 # clean up our mess
 END {
-    if($schema && ($dbh = $schema->storage->dbh)) {
-        $dbh->do("DROP SEQUENCE artist_seq");
-        $dbh->do("DROP SEQUENCE cd_seq");
-        $dbh->do("DROP SEQUENCE track_seq");
-        $dbh->do("DROP SEQUENCE pkid1_seq");
-        $dbh->do("DROP SEQUENCE pkid2_seq");
-        $dbh->do("DROP SEQUENCE nonpkid_seq");
-        $dbh->do("DROP TABLE artist");
-        $dbh->do("DROP TABLE sequence_test");
-        $dbh->do("DROP TABLE track");
-        $dbh->do("DROP TABLE cd");
-        $dbh->do("DROP TABLE bindtype_test");
-    }
+  for my $dbh (map $_->storage->dbh, grep $_, ($schema, $schema2)) {
+    eval {
+      $dbh->do("DROP SEQUENCE artist_seq");
+      $dbh->do("DROP SEQUENCE cd_seq");
+      $dbh->do("DROP SEQUENCE track_seq");
+      $dbh->do("DROP SEQUENCE pkid1_seq");
+      $dbh->do("DROP SEQUENCE pkid2_seq");
+      $dbh->do("DROP SEQUENCE nonpkid_seq");
+      $dbh->do("DROP TABLE artist");
+      $dbh->do("DROP TABLE sequence_test");
+      $dbh->do("DROP TABLE track");
+      $dbh->do("DROP TABLE cd");
+      $dbh->do("DROP TABLE bindtype_test");
+    };
+  }
 }
-