X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle.t;h=734e4119b906a6f88ee09a8131e53a5c9d5100b5;hb=a85b7ebe9762ca64a08468f6c8f27a0ae583d38c;hp=540ce4e739ad7d468ba8f5b7d83c9bc234d3cd1c;hpb=606b30c3da4f8df001c824586d38da8838713f78;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/73oracle.t b/t/73oracle.t
index 540ce4e..734e411 100644
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -84,9 +84,14 @@ $schema->class('Track')->load_components('PK::Auto::Oracle');
 
 # test primary key handling with multiple triggers
 my $new = $schema->resultset('Artist')->create({ name => 'foo' });
-is($new->artistid, 1, "Oracle Auto-PK worked");
+is($new->artistid, 1, "Oracle Auto-PK worked for sqlt-like trigger");
 
-like ($new->result_source->column_info('artistid')->{sequence}, qr/\.artist_pk_seq$/, 'Correct PK sequence selected');
+like ($new->result_source->column_info('artistid')->{sequence}, qr/\.artist_pk_seq$/, 'Correct PK sequence selected for sqlt-like trigger');
+
+$new = $schema->resultset('CD')->create({ artist => 1, title => 'foo', year => '2003' });
+is($new->cdid, 1, "Oracle Auto-PK worked for custom trigger");
+
+like ($new->result_source->column_info('cdid')->{sequence}, qr/\.cd_seq$/, 'Correct PK sequence selected for custom trigger');
 
 # test again with fully-qualified table name
 my $artistfqn_rs = $schema->resultset('ArtistFQN');
@@ -120,7 +125,7 @@ is( $it->next->name, "Artist 6", "iterator->next ok" );
 is( $it->next, undef, "next past end of resultset ok" );
 
 my $cd = $schema->resultset('CD')->create({ artist => 1, title => 'EP C', year => '2003' });
-is($cd->cdid, 1, "Oracle Auto-PK worked - using scalar ref as table name");
+is($cd->cdid, 2, "Oracle Auto-PK worked - using scalar ref as table name");
 
 # test rel names over the 30 char limit
 {
@@ -131,7 +136,7 @@ is($cd->cdid, 1, "Oracle Auto-PK worked - using scalar ref as table name");
   });
 
   lives_and {
-    is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1
+    is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 2
   } 'query with rel name over 30 chars survived and worked';
 
   # rel name over 30 char limit with user condition
@@ -361,13 +366,13 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
     );
 
     $schema->resultset('Artist')->find({ name => 'cycle-root' })
-      ->update({ parentid => \'artistid' });
+      ->update({ parentid => { -ident => 'artistid' } });
 
     # select the whole tree
     {
       my $rs = $schema->resultset('Artist')->search({}, {
         start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by => { parentid => { -prior => { -ident => 'artistid' } } },
       });
 
       is_same_sql_bind (
@@ -409,7 +414,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
 
       my $rs = $schema->resultset('Artist')->search({}, {
         start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by => { parentid => { -prior => { -ident =>  'artistid' } } },
         order_siblings_by => { -desc => 'name' },
       });
 
@@ -436,7 +441,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
     {
       my $rs = $schema->resultset('Artist')->search({ parentid => undef }, {
         start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by => { parentid => { -prior => { -ident => 'artistid' } } },
       });
 
       is_same_sql_bind (
@@ -469,7 +474,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
         {
           join => 'cds',
           start_with => { 'me.name' => 'root' },
-          connect_by => { parentid => { -prior => \ 'artistid' } },
+          connect_by => { parentid => { -prior => { -ident => 'artistid' } } },
         }
       );
 
@@ -513,7 +518,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
     {
       my $rs = $schema->resultset('Artist')->search({}, {
         start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by => { parentid => { -prior => { -ident => 'artistid' } } },
         order_by => { -asc => [ 'LEVEL', 'name' ] },
       });
 
@@ -558,7 +563,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
 
       my $rs = $schema->resultset('Artist')->search({}, {
         start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by => { parentid => { -prior => { -ident => 'artistid' } } },
         order_by => { -asc => 'name' },
         rows => 2,
       });
@@ -615,7 +620,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
       my $rs = $schema->resultset('Artist')->search({}, {
         select => ['count(rank)'],
         start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by => { parentid => { -prior => { -ident => 'artistid' } } },
         group_by => ['rank'],
         having => { 'count(rank)' => { '<', 2 } },
       });
@@ -644,7 +649,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
     {
       my $rs = $schema->resultset('Artist')->search({}, {
         start_with => { name => 'cycle-root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
+        connect_by => { parentid => { -prior => { -ident => 'artistid' } } },
       });
       eval { $rs->get_column ('name')->all };
       if ( $@ =~ /ORA-01436/ ){ # ORA-01436:  CONNECT BY loop in user data
@@ -663,7 +668,7 @@ if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
       my $rs = $schema->resultset('Artist')->search({}, {
         start_with => { name => 'cycle-root' },
         '+select'  => [ \ 'CONNECT_BY_ISCYCLE' ],
-        connect_by_nocycle => { parentid => { -prior => \ 'artistid' } },
+        connect_by_nocycle => { parentid => { -prior => { -ident => 'artistid' } } },
       });
 
       is_same_sql_bind (
@@ -831,23 +836,18 @@ sub do_creates {
     CREATE OR REPLACE TRIGGER cd_insert_trg
     BEFORE INSERT OR UPDATE ON cd
     FOR EACH ROW
+    DECLARE
+    tmpVar NUMBER;
+
     BEGIN
+      tmpVar := 0;
+
       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;
+        INTO tmpVar
+        FROM dual;
+
+        :new.cdid := tmpVar;
       END IF;
     END;
   });