X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle.t;h=4231127ac90a4b1a9b8cdf426286b0be57e6668e;hb=07cda1c5a7df6656772dfd65c488c19c15126168;hp=3192acbac419c02e52b8c9b2c6c937fb1fa93139;hpb=df6e3f5c0c1a8250692b4f89e4c72c235d178bd2;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/73oracle.t b/t/73oracle.t
index 3192acb..4231127 100644
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -5,20 +5,24 @@
   use base 'DBIx::Class::Core';
 
   __PACKAGE__->table(
-      defined $ENV{DBICTEST_ORA_USER}
-      ? $ENV{DBICTEST_ORA_USER} . '.artist'
+    defined $ENV{DBICTEST_ORA_USER}
+      ? (uc $ENV{DBICTEST_ORA_USER}) . '.artist'
       : 'artist'
   );
   __PACKAGE__->add_columns(
-      'artistid' => {
-          data_type         => 'integer',
-          is_auto_increment => 1,
-      },
-      'name' => {
-          data_type   => 'varchar',
-          size        => 100,
-          is_nullable => 1,
-      },
+    'artistid' => {
+      data_type         => 'integer',
+      is_auto_increment => 1,
+    },
+    'name' => {
+      data_type   => 'varchar',
+      size        => 100,
+      is_nullable => 1,
+    },
+    'autoinc_col' => {
+      data_type         => 'integer',
+      is_auto_increment => 1,
+    },
   );
   __PACKAGE__->set_primary_key('artistid');
 
@@ -38,146 +42,99 @@ use DBIC::SqlMakerTest;
 my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_ORA_${_}" }  qw/DSN USER PASS/};
 
 # optional:
-my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_ORA2_${_}" } qw/DSN USER PASS/};
+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\''.
-  ' as well as following sequences: \'pkid1_seq\', \'pkid2_seq\' and \'nonpkid_seq\''
+plan skip_all => 'Set $ENV{DBICTEST_ORA_DSN}, _USER and _PASS to run this test.'
   unless ($dsn && $user && $pass);
 
 DBICTest::Schema->load_classes('ArtistFQN');
-my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 
-my $dbh = $schema->storage->dbh;
+# This is in Core now, but it's here just to test that it doesn't break
+DBICTest::Schema::Artist->load_components('PK::Auto');
+# These are compat shims for PK::Auto...
+DBICTest::Schema::CD->load_components('PK::Auto::Oracle');
+DBICTest::Schema::Track->load_components('PK::Auto::Oracle');
 
-do_creates($dbh);
 
-{
-    # Swiped from t/bindtype_columns.t to avoid creating my own Resultset.
+##########
+# recyclebin sometimes comes in the way
+my $on_connect_sql = ["ALTER SESSION SET recyclebin = OFF"];
 
-    local $SIG{__WARN__} = sub {};
-    eval { $dbh->do('DROP TABLE bindtype_test') };
-
-    $dbh->do(qq[
-        CREATE TABLE bindtype_test
-        (
-            id              integer      NOT NULL   PRIMARY KEY,
-            bytea           integer      NULL,
-            blob            blob         NULL,
-            clob            clob         NULL
-        )
-    ],{ RaiseError => 1, PrintError => 1 });
-}
+# iterate all tests on following options
+my @tryopt = (
+  { on_connect_do => $on_connect_sql },
+  { quote_char => '"', on_connect_do => $on_connect_sql, },
+);
 
-# This is in Core now, but it's here just to test that it doesn't break
-$schema->class('Artist')->load_components('PK::Auto');
-# These are compat shims for PK::Auto...
-$schema->class('CD')->load_components('PK::Auto::Oracle');
-$schema->class('Track')->load_components('PK::Auto::Oracle');
+# keep a database handle open for cleanup
+my $dbh;
 
-# test primary key handling
-my $new = $schema->resultset('Artist')->create({ name => 'foo' });
-is($new->artistid, 1, "Oracle Auto-PK worked");
+for my $opt (@tryopt) {
+  # clean all cached sequences from previous run
+  for (map { values %{DBICTest::Schema->source($_)->columns_info} } (qw/Artist CD Track/) ) {
+    delete $_->{sequence};
+  }
 
-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");
+  my $schema = DBICTest::Schema->connect($dsn, $user, $pass, $opt);
+  my $q = $schema -> storage -> sql_maker -> quote_char || '';
 
-# test again with fully-qualified table name
-$new = $schema->resultset('ArtistFQN')->create( { name => 'bar' } );
-is( $new->artistid, 2, "Oracle Auto-PK worked with fully-qualified tablename" );
+  $dbh = $schema->storage->dbh;
 
-# test rel names over the 30 char limit
-my $query = $schema->resultset('Artist')->search({
-  artistid => 1 
-}, {
-  prefetch => 'cds_very_very_very_long_relationship_name'
-});
-
-lives_and {
-  is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1
-} 'query with rel name over 30 chars survived and worked';
-
-# rel name over 30 char limit with user condition
-# This requires walking the SQLA data structure.
-{
-  local $TODO = 'user condition on rel longer than 30 chars';
+  do_creates($dbh, $q);
 
-  $query = $schema->resultset('Artist')->search({
-    'cds_very_very_very_long_relationship_name.title' => 'EP C'
-  }, {
-    prefetch => 'cds_very_very_very_long_relationship_name'
-  });
+# test primary key handling with multiple triggers
+  my ($new, $seq);
 
-  lives_and {
-    is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1
-  } 'query with rel name over 30 chars and user condition survived and worked';
-}
+  $new = $schema->resultset('Artist')->create({ name => 'foo' });
+  is($new->artistid, 1, "Oracle Auto-PK worked for standard sqlt-like trigger");
+  $seq = $new->result_source->column_info('artistid')->{sequence};
+  $seq = $$seq if ref $seq;
+  like ($seq, qr/\.${q}artist_pk_seq${q}$/, 'Correct PK sequence selected for sqlt-like trigger');
 
-# test join with row count ambiguity
+  $new = $schema->resultset('CD')->create({ artist => 1, title => 'EP C', year => '2003' });
+  is($new->cdid, 1, 'Oracle Auto-PK worked - using scalar ref as table name/custom weird trigger');
+  $seq = $new->result_source->column_info('cdid')->{sequence};
+  $seq = $$seq if ref $seq;
+  like ($seq, qr/\.${q}cd_seq${q}$/, 'Correct PK sequence selected for custom trigger');
 
-my $track = $schema->resultset('Track')->create({ cd => $cd->cdid,
-    position => 1, title => 'Track1' });
-my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'},
-        { join => 'cd',
-          rows => 2 }
-);
 
-ok(my $row = $tjoin->next);
+# test PKs again with fully-qualified table name
+  my $artistfqn_rs = $schema->resultset('ArtistFQN');
+  my $artist_rsrc = $artistfqn_rs->result_source;
 
-is($row->title, 'Track1', "ambiguous column ok");
+  delete $artist_rsrc->column_info('artistid')->{sequence};
+  $new = $artistfqn_rs->create( { name => 'bar' } );
 
-# check count distinct with multiple columns
-my $other_track = $schema->resultset('Track')->create({ cd => $cd->cdid, position => 1, title => 'Track2' });
+  is( $new->artistid, 2, "Oracle Auto-PK worked with fully-qualified tablename" );
 
-my $tcount = $schema->resultset('Track')->search(
-  {},
-  {
-    select => [ qw/position title/ ],
-    distinct => 1,
-  }
-);
-is($tcount->count, 2, 'multiple column COUNT DISTINCT ok');
 
-$tcount = $schema->resultset('Track')->search(
-  {},
-  {
-    columns => [ qw/position title/ ],
-    distinct => 1,
-  }
-);
-is($tcount->count, 2, 'multiple column COUNT DISTINCT ok');
+  delete $artist_rsrc->column_info('artistid')->{sequence};
+  $new = $artistfqn_rs->create( { name => 'bar', autoinc_col => 1000 } );
+
+  is( $new->artistid, 3, "Oracle Auto-PK worked with fully-qualified tablename" );
+  is( $new->autoinc_col, 1000, "Oracle Auto-Inc overruled with fully-qualified tablename");
+  $seq = $new->result_source->column_info('artistid')->{sequence};
+  $seq = $$seq if ref $seq;
+  like ($seq, qr/\.${q}artist_pk_seq${q}$/, 'Correct PK sequence selected for sqlt-like trigger');
 
-$tcount = $schema->resultset('Track')->search(
-  {},
-  {
-     group_by => [ qw/position title/ ]
-  }
-);
-is($tcount->count, 2, 'multiple column COUNT DISTINCT using column syntax ok');
 
 # test LIMIT support
-for (1..6) {
+  for (1..6) {
     $schema->resultset('Artist')->create({ name => 'Artist ' . $_ });
-}
-my $it = $schema->resultset('Artist')->search( {},
-    { rows => 3,
-      offset => 3,
-      order_by => 'artistid' }
-);
-is( $it->count, 3, "LIMIT count ok" );
-is( $it->next->name, "Artist 2", "iterator->next ok" );
-$it->next;
-$it->next;
-is( $it->next, undef, "next past end of resultset ok" );
+  }
+  my $it = $schema->resultset('Artist')->search( { name => { -like => 'Artist %' } }, {
+    rows => 3,
+    offset => 4,
+    order_by => 'artistid'
+  });
+
+  is( $it->count, 2, "LIMIT count past end of RS ok" );
+  is( $it->next->name, "Artist 5", "iterator->next ok" );
+  is( $it->next->name, "Artist 6", "iterator->next ok" );
+  is( $it->next, undef, "next past end of resultset ok" );
 
-{
-  my $rs = $schema->resultset('Track')->search( undef, { columns=>[qw/trackid position/], group_by=> [ qw/trackid position/ ] , rows => 2, offset=>1 });
-  my @results = $rs->all;
-  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',
@@ -186,577 +143,314 @@ is( $it->next, undef, "next past end of resultset ok" );
     })->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 {
-    $schema->resultset('Track')->create({
-      trackid => 999, cd => 999, position => 1, title => 'deferred FK track'
-    });
-    $schema->resultset('CD')->create({
-      artist => 1, cdid => 999, year => '2003', title => 'deferred FK cd'
-    });
-  });
-} 'with_deferred_fk_checks code survived';
 
-is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track',
-   'code in with_deferred_fk_checks worked'; 
-
-throws_ok {
-  $schema->resultset('Track')->create({
-    trackid => 1, cd => 9999, position => 1, title => 'Track1'
+# test rel names over the 30 char limit
+  my $query = $schema->resultset('Artist')->search({
+    artistid => 1
+  }, {
+    prefetch => 'cds_very_very_very_long_relationship_name'
   });
-} qr/constraint/i, 'with_deferred_fk_checks is off';
-
-# test auto increment using sequences WITHOUT triggers
-for (1..5) {
-    my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' });
-    is($st->pkid1, $_, "Oracle Auto-PK without trigger: First primary key");
-    is($st->pkid2, $_ + 9, "Oracle Auto-PK without trigger: Second primary key");
-    is($st->nonpkid, $_ + 19, "Oracle Auto-PK without trigger: Non-primary key");
-}
-my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 });
-is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manually");
 
-SKIP: {
-  my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
-  $binstr{'large'} = $binstr{'small'} x 1024;
-
-  my $maxloblen = length $binstr{'large'};
-  note "Localizing LongReadLen to $maxloblen to avoid truncation of test data";
-  local $dbh->{'LongReadLen'} = $maxloblen;
+  lives_and {
+    is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1
+  } 'query with rel name over 30 chars survived and worked';
 
-  my $rs = $schema->resultset('BindType');
-  my $id = 0;
+  # rel name over 30 char limit with user condition
+  # This requires walking the SQLA data structure.
+  {
+    local $TODO = 'user condition on rel longer than 30 chars';
 
-  if ($DBD::Oracle::VERSION eq '1.23') {
-    throws_ok { $rs->create({ id => 1, blob => $binstr{large} }) }
-      qr/broken/,
-      'throws on blob insert with DBD::Oracle == 1.23';
+    $query = $schema->resultset('Artist')->search({
+      'cds_very_very_very_long_relationship_name.title' => 'EP C'
+    }, {
+      prefetch => 'cds_very_very_very_long_relationship_name'
+    });
 
-    skip 'buggy BLOB support in DBD::Oracle 1.23', 7;
+    lives_and {
+      is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1
+    } 'query with rel name over 30 chars and user condition survived and worked';
   }
 
-  foreach my $type (qw( blob clob )) {
-    foreach my $size (qw( small large )) {
-      $id++;
 
-      lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) }
-      "inserted $size $type without dying";
+# test join with row count ambiguity
+  my $cd = $schema->resultset('CD')->next;
+  my $track = $cd->create_related('tracks', { position => 1, title => 'Track1'} );
+  my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'}, {
+    join => 'cd', rows => 2
+  });
 
-      ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" );
-    }
-  }
-}
+  ok(my $row = $tjoin->next);
 
+  is($row->title, 'Track1', "ambiguous column ok");
 
-### test hierarchical queries
-if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) {
-    my $source = $schema->source('Artist');
-
-    $source->add_column( 'parentid' );
-
-    $source->add_relationship('children', 'DBICTest::Schema::Artist',
-        { 'foreign.parentid' => 'self.artistid' },
-        {
-            accessor => 'multi',
-            join_type => 'LEFT',
-            cascade_delete => 1,
-            cascade_copy => 1,
-        } );
-    $source->add_relationship('parent', 'DBICTest::Schema::Artist',
-        { 'foreign.artistid' => 'self.parentid' },
-        { accessor => 'single' } );
-    DBICTest::Schema::Artist->add_column( 'parentid' );
-    DBICTest::Schema::Artist->has_many(
-        children => 'DBICTest::Schema::Artist',
-        { 'foreign.parentid' => 'self.artistid' }
-    );
-    DBICTest::Schema::Artist->belongs_to(
-        parent => 'DBICTest::Schema::Artist',
-        { 'foreign.artistid' => 'self.parentid' }
-    );
 
-    $schema->resultset('Artist')->create ({
-        name => 'root',
-        rank => 1,
-        cds => [],
-        children => [
-            {
-                name => 'child1',
-                rank => 2,
-                children => [
-                    {
-                        name => 'grandchild',
-                        rank => 3,
-                        cds => [
-                            {
-                                title => "grandchilds's cd" ,
-                                year => '2008',
-                                tracks => [
-                                    {
-                                        position => 1,
-                                        title => 'Track 1 grandchild',
-                                    }
-                                ],
-                            }
-                        ],
-                        children => [
-                            {
-                                name => 'greatgrandchild',
-                                rank => 3,
-                            }
-                        ],
-                    }
-                ],
-            },
-            {
-                name => 'child2',
-                rank => 3,
-            },
-        ],
-    });
 
-    $schema->resultset('Artist')->create(
-        {
-            name     => 'cycle-root',
-            children => [
-                {
-                    name     => 'cycle-child1',
-                    children => [ { name => 'cycle-grandchild' } ],
-                },
-                { name => 'cycle-child2' },
-            ],
-        }
-    );
-
-    $schema->resultset('Artist')->find({ name => 'cycle-root' })
-      ->update({ parentid => \'artistid' });
+# check count distinct with multiple columns
+  my $other_track = $schema->resultset('Track')->create({ cd => $cd->cdid, position => 1, title => 'Track2' });
 
-    # select the whole tree
+  my $tcount = $schema->resultset('Track')->search(
+    {},
     {
-      my $rs = $schema->resultset('Artist')->search({}, {
-        start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
-      });
-
-      is_same_sql_bind (
-        $rs->as_query,
-        '(
-          SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid
-            FROM artist me
-          START WITH name = ?
-          CONNECT BY parentid = PRIOR artistid 
-        )',
-        [ [ name => 'root'] ],
-      );
-      is_deeply (
-        [ $rs->get_column ('name')->all ],
-        [ qw/root child1 grandchild greatgrandchild child2/ ],
-        'got artist tree',
-      );
-
-
-      is_same_sql_bind (
-        $rs->count_rs->as_query,
-        '(
-          SELECT COUNT( * )
-            FROM artist me
-          START WITH name = ?
-          CONNECT BY parentid = PRIOR artistid 
-        )',
-        [ [ name => 'root'] ],
-      );
-
-      is( $rs->count, 5, 'Connect By count ok' );
+      select => [ qw/position title/ ],
+      distinct => 1,
     }
+  );
+  is($tcount->count, 2, 'multiple column COUNT DISTINCT ok');
 
-    # use order siblings by statement
+  $tcount = $schema->resultset('Track')->search(
+    {},
     {
-      my $rs = $schema->resultset('Artist')->search({}, {
-        start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
-        order_siblings_by => { -desc => 'name' },
-      });
-
-      is_same_sql_bind (
-        $rs->as_query,
-        '(
-          SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid
-            FROM artist me
-          START WITH name = ?
-          CONNECT BY parentid = PRIOR artistid 
-          ORDER SIBLINGS BY name DESC
-        )',
-        [ [ name => 'root'] ],
-      );
-
-      is_deeply (
-        [ $rs->get_column ('name')->all ],
-        [ qw/root child2 child1 grandchild greatgrandchild/ ],
-        'Order Siblings By ok',
-      );
+      columns => [ qw/position title/ ],
+      distinct => 1,
     }
+  );
+  is($tcount->count, 2, 'multiple column COUNT DISTINCT ok');
 
-    # get the root node
+  $tcount = $schema->resultset('Track')->search(
+    {},
     {
-      my $rs = $schema->resultset('Artist')->search({ parentid => undef }, {
-        start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
-      });
-
-      is_same_sql_bind (
-        $rs->as_query,
-        '(
-          SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid
-            FROM artist me
-          WHERE ( parentid IS NULL )
-          START WITH name = ?
-          CONNECT BY parentid = PRIOR artistid 
-        )',
-        [ [ name => 'root'] ],
-      );
-
-      is_deeply(
-        [ $rs->get_column('name')->all ],
-        [ 'root' ],
-        'found root node',
-      );
+      group_by => [ qw/position title/ ]
     }
+  );
+  is($tcount->count, 2, 'multiple column COUNT DISTINCT using column syntax ok');
 
-    # combine a connect by with a join
-    {
-      my $rs = $schema->resultset('Artist')->search(
-        {'cds.title' => { -like => '%cd'} },
-        {
-          join => 'cds',
-          start_with => { 'me.name' => 'root' },
-          connect_by => { parentid => { -prior => \ 'artistid' } },
-        }
-      );
-
-      is_same_sql_bind (
-        $rs->as_query,
-        '(
-          SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid
-            FROM artist me
-            LEFT JOIN cd cds ON cds.artist = me.artistid
-          WHERE ( cds.title LIKE ? )
-          START WITH me.name = ?
-          CONNECT BY parentid = PRIOR artistid 
-        )',
-        [ [ 'cds.title' => '%cd' ], [ 'me.name' => 'root' ] ],
-      );
-
-      is_deeply(
-        [ $rs->get_column('name')->all ],
-        [ 'grandchild' ],
-        'Connect By with a join result name ok'
-      );
-
-
-      is_same_sql_bind (
-        $rs->count_rs->as_query,
-        '(
-          SELECT COUNT( * )
-            FROM artist me
-            LEFT JOIN cd cds ON cds.artist = me.artistid
-          WHERE ( cds.title LIKE ? )
-          START WITH me.name = ?
-          CONNECT BY parentid = PRIOR artistid 
-        )',
-        [ [ 'cds.title' => '%cd' ], [ 'me.name' => 'root' ] ],
-      );
-
-      is( $rs->count, 1, 'Connect By with a join; count ok' );
-    }
 
-    # combine a connect by with order_by
-    {
-      my $rs = $schema->resultset('Artist')->search({}, {
-        start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
-        order_by => { -asc => [ 'LEVEL', 'name' ] },
+# check group_by
+  my $g_rs = $schema->resultset('Track')->search( undef, { columns=>[qw/trackid position/], group_by=> [ qw/trackid position/ ] , rows => 2, offset => 1 });
+  is( scalar $g_rs->all, 1, "Group by with limit OK" );
+
+
+# test with_deferred_fk_checks
+  lives_ok {
+    $schema->storage->with_deferred_fk_checks(sub {
+      $schema->resultset('Track')->create({
+        trackid => 999, cd => 999, position => 1, title => 'deferred FK track'
+      });
+      $schema->resultset('CD')->create({
+        artist => 1, cdid => 999, year => '2003', title => 'deferred FK cd'
       });
+    });
+  } 'with_deferred_fk_checks code survived';
 
-      is_same_sql_bind (
-        $rs->as_query,
-        '(
-          SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid
-            FROM artist me
-          START WITH name = ?
-          CONNECT BY parentid = PRIOR artistid 
-          ORDER BY LEVEL ASC, name ASC
-        )',
-        [ [ name => 'root' ] ],
-      );
-
-      is_deeply (
-        [ $rs->get_column ('name')->all ],
-        [ qw/root child1 child2 grandchild greatgrandchild/ ],
-        'Connect By with a order_by - result name ok'
-      );
-    }
+  is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track',
+    'code in with_deferred_fk_checks worked'; 
 
+  throws_ok {
+    $schema->resultset('Track')->create({
+      trackid => 1, cd => 9999, position => 1, title => 'Track1'
+    });
+  } qr/constraint/i, 'with_deferred_fk_checks is off';
 
-    # limit a connect by
-    {
-      my $rs = $schema->resultset('Artist')->search({}, {
-        start_with => { name => 'root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
-        order_by => { -asc => 'name' },
-        rows => 2,
-      });
 
-      is_same_sql_bind (
-        $rs->as_query,
-        '( 
-            SELECT artistid, name, rank, charfield, parentid FROM (
-                  SELECT artistid, name, rank, charfield, parentid, ROWNUM rownum__index FROM (
-                      SELECT 
-                          me.artistid,
-                          me.name,
-                          me.rank,
-                          me.charfield,
-                          me.parentid 
-                      FROM artist me 
-                      START WITH name = ? 
-                      CONNECT BY parentid = PRIOR artistid
-                      ORDER BY name ASC 
-                  ) me 
-            ) me
-            WHERE rownum__index BETWEEN 1 AND 2
-        )',
-        [ [ name => 'root' ] ],
-      );
-
-      is_deeply (
-        [ $rs->get_column ('name')->all ],
-        [qw/child1 child2/],
-        'LIMIT a Connect By query - correct names'
-      );
-
-      # TODO: 
-      # prints "START WITH name = ? 
-      # CONNECT BY artistid = PRIOR parentid "
-      # after count_subq, 
-      # I will fix this later...
-      # 
-      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' );
-    }
+# test auto increment using sequences WITHOUT triggers
+  for (1..5) {
+    my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' });
+    is($st->pkid1, $_, "Oracle Auto-PK without trigger: First primary key");
+    is($st->pkid2, $_ + 9, "Oracle Auto-PK without trigger: Second primary key");
+    is($st->nonpkid, $_ + 19, "Oracle Auto-PK without trigger: Non-primary key");
+  }
+  my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 });
+  is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manually");
 
-    # 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'
-      );
-    }
+# test BLOBs
+  SKIP: {
+  TODO: {
+    my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
+    $binstr{'large'} = $binstr{'small'} x 1024;
 
+    my $maxloblen = length $binstr{'large'};
+    note "Localizing LongReadLen to $maxloblen to avoid truncation of test data";
+    local $dbh->{'LongReadLen'} = $maxloblen;
 
-    # select the whole cycle tree without nocylce
-    {
-      my $rs = $schema->resultset('Artist')->search({}, {
-        start_with => { name => 'cycle-root' },
-        connect_by => { parentid => { -prior => \ 'artistid' } },
-      });
-      eval { $rs->get_column ('name')->all };
-      if ( $@ =~ /ORA-01436/ ){ # ORA-01436:  CONNECT BY loop in user data
-        pass "connect by initify loop detection without nocycle";
-      }else{
-        fail "connect by initify loop detection without nocycle, not detected by oracle";
-      }
+    my $rs = $schema->resultset('BindType');
+    my $id = 0;
+
+    if ($DBD::Oracle::VERSION eq '1.23') {
+      throws_ok { $rs->create({ id => 1, blob => $binstr{large} }) }
+        qr/broken/,
+        'throws on blob insert with DBD::Oracle == 1.23';
+
+      skip 'buggy BLOB support in DBD::Oracle 1.23', 7;
     }
 
-    # select the whole cycle tree with nocylce
-    {
-      my $rs = $schema->resultset('Artist')->search({}, {
-        start_with => { name => 'cycle-root' },
-        '+select'  => [ \ 'CONNECT_BY_ISCYCLE' ],
-        connect_by_nocycle => { parentid => { -prior => \ 'artistid' } },
-      });
+    # disable BLOB mega-output
+    my $orig_debug = $schema->storage->debug;
+    $schema->storage->debug (0);
+
+    local $TODO = 'Something is confusing column bindtype assignment when quotes are active'
+      if $q;
 
-      is_same_sql_bind (
-        $rs->as_query,
-        '(
-          SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid, CONNECT_BY_ISCYCLE
-            FROM artist me
-          START WITH name = ?
-          CONNECT BY NOCYCLE parentid = PRIOR artistid 
-        )',
-        [ [ name => 'cycle-root'] ],
-      );
-      is_deeply (
-        [ $rs->get_column ('name')->all ],
-        [ qw/cycle-root cycle-child1 cycle-grandchild cycle-child2/ ],
-        'got artist tree with nocycle (name)',
-      );
-      is_deeply (
-        [ $rs->get_column ('CONNECT_BY_ISCYCLE')->all ],
-        [ qw/1 0 0 0/ ],
-        'got artist tree with nocycle (CONNECT_BY_ISCYCLE)',
-      );
-
-
-      is_same_sql_bind (
-        $rs->count_rs->as_query,
-        '(
-          SELECT COUNT( * )
-            FROM artist me
-          START WITH name = ?
-          CONNECT BY NOCYCLE parentid = PRIOR artistid 
-        )',
-        [ [ name => 'cycle-root'] ],
-      );
-
-      is( $rs->count, 4, 'Connect By Nocycle count ok' );
+    foreach my $type (qw( blob clob )) {
+      foreach my $size (qw( small large )) {
+        $id++;
+
+        lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) }
+        "inserted $size $type without dying";
+        ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" );
+      }
     }
-}
 
-my $schema2;
+    $schema->storage->debug ($orig_debug);
+  }}
+
 
 # test sequence detection from a different schema
-if ($dsn2 && $user2) {
-  $schema2 = DBICTest::Schema->connect($dsn2, $user2, $pass2);
+  SKIP: {
+  TODO: {
+    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;
+
+    # Oracle8i Reference Release 2 (8.1.6) 
+    #   http://download.oracle.com/docs/cd/A87860_01/doc/server.817/a76961/ch294.htm#993
+    # Oracle Database Reference 10g Release 2 (10.2)
+    #   http://download.oracle.com/docs/cd/B19306_01/server.102/b14237/statviews_2107.htm#sthref1297
+    local $TODO = "On Oracle8i all_triggers view is empty, i don't yet know why..."
+      if $schema->storage->_server_info->{normalized_dbms_version} < 9;
+
+    my $schema2 = DBICTest::Schema->connect($dsn2, $user2, $pass2, $opt);
+
+
+    my $schema1_dbh  = $schema->storage->dbh;
+    $schema1_dbh->do("GRANT INSERT ON ${q}artist${q} TO " . uc $user2);
+    $schema1_dbh->do("GRANT SELECT ON ${q}artist_pk_seq${q} TO " . uc $user2);
+
+
+    my $rs = $schema2->resultset('ArtistFQN');
+    delete $rs->result_source->column_info('artistid')->{sequence};
+
+    # 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 (do_creates always uses an lc name)
+    my $q_seq = $q
+      ? '"artist_pk_seq"'
+      : '"ARTIST_PK_SEQ"'
+    ;
+    delete $rs->result_source->column_info('artistid')->{sequence};
+    $schema1_dbh->do(qq{
+      CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_pk${q}
+      BEFORE INSERT ON ${q}artist${q}
+      FOR EACH ROW
+      BEGIN
+        IF :new.${q}artistid${q} IS NULL THEN
+          SELECT $q_seq.nextval
+          INTO :new.${q}artistid${q}
+          FROM DUAL;
+        END IF;
+      END;
+    });
 
-  my $dbh  = $schema->storage->dbh;
-  my $dbh2 = $schema2->storage->dbh;
 
-  $dbh->do("GRANT INSERT ON artist TO $user2");
-  $dbh->do("GRANT SELECT ON artist_seq TO $user2");
+    lives_and {
+      my $row = $rs->create({ name => 'From Different Schema With Quoted Sequence' });
+      ok $row->artistid;
+    } 'used quoted autoinc sequence across schemas';
 
-  my $rs = $schema2->resultset('Artist');
+    my $schema_name = uc $user;
 
-  # qualify table with schema
-  local $rs->result_source->{name} = "${user}.artist";
+    is_deeply $rs->result_source->column_info('artistid')->{sequence},
+      \qq|${schema_name}.$q_seq|,
+      'quoted sequence name correctly extracted';
+  }}
 
-  lives_and {
-    my $row = $rs->create({ name => 'Different Schema' });
-    ok $row->artistid;
-  } 'detected autoinc sequence across schemas';
+  do_clean ($dbh);
 }
 
 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");
+  my ($dbh, $q) = @_;
+
+  do_clean($dbh);
+
+  $dbh->do("CREATE SEQUENCE ${q}artist_autoinc_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE ${q}artist_pk_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE ${q}cd_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0");
+  $dbh->do("CREATE SEQUENCE ${q}track_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0");
+
+  $dbh->do("CREATE SEQUENCE ${q}nonpkid_seq${q} START WITH 20 MAXVALUE 999999 MINVALUE 0");
+  # this one is always quoted as per manually specified sequence =>
+  $dbh->do('CREATE SEQUENCE "pkid1_seq" START WITH 1 MAXVALUE 999999 MINVALUE 0');
+  # this one is always unquoted as per manually specified sequence =>
   $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 ${q}artist${q} (${q}artistid${q} NUMBER(12), ${q}name${q} VARCHAR(255), ${q}autoinc_col${q} NUMBER(12), ${q}rank${q} NUMBER(38), ${q}charfield${q} VARCHAR2(10))");
+  $dbh->do("ALTER TABLE ${q}artist${q} ADD (CONSTRAINT ${q}artist_pk${q} PRIMARY KEY (${q}artistid${q}))");
+
+  $dbh->do("CREATE TABLE ${q}sequence_test${q} (${q}pkid1${q} NUMBER(12), ${q}pkid2${q} NUMBER(12), ${q}nonpkid${q} NUMBER(12), ${q}name${q} VARCHAR(255))");
+  $dbh->do("ALTER TABLE ${q}sequence_test${q} ADD (CONSTRAINT ${q}sequence_test_constraint${q} PRIMARY KEY (${q}pkid1${q}, ${q}pkid2${q}))");
 
-  $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))");
+  # table cd will be unquoted => Oracle will see it as uppercase
+  $dbh->do("CREATE TABLE cd (${q}cdid${q} NUMBER(12), ${q}artist${q} NUMBER(12), ${q}title${q} VARCHAR(255), ${q}year${q} VARCHAR(4), ${q}genreid${q} NUMBER(12), ${q}single_track${q} NUMBER(12))");
+  $dbh->do("ALTER TABLE cd ADD (CONSTRAINT ${q}cd_pk${q} PRIMARY KEY (${q}cdid${q}))");
 
-  $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 ${q}track${q} (${q}trackid${q} NUMBER(12), ${q}cd${q} NUMBER(12) REFERENCES CD(${q}cdid${q}) DEFERRABLE, ${q}position${q} NUMBER(12), ${q}title${q} VARCHAR(255), ${q}last_updated_on${q} DATE, ${q}last_updated_at${q} DATE, ${q}small_dt${q} DATE)");
+  $dbh->do("ALTER TABLE ${q}track${q} ADD (CONSTRAINT ${q}track_pk${q} PRIMARY KEY (${q}trackid${q}))");
 
-  $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("CREATE TABLE ${q}bindtype_test${q} (${q}id${q} integer NOT NULL PRIMARY KEY, ${q}bytea${q} integer NULL, ${q}blob${q} blob NULL, ${q}clob${q} clob NULL)");
 
   $dbh->do(qq{
-    CREATE OR REPLACE TRIGGER artist_insert_trg
-    BEFORE INSERT ON artist
+    CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_auto${q}
+    BEFORE INSERT ON ${q}artist${q}
     FOR EACH ROW
     BEGIN
-      IF :new.artistid IS NULL THEN
-        SELECT artist_seq.nextval
-        INTO :new.artistid
+      IF :new.${q}autoinc_col${q} IS NULL THEN
+        SELECT ${q}artist_autoinc_seq${q}.nextval
+        INTO :new.${q}autoinc_col${q}
         FROM DUAL;
       END IF;
     END;
   });
+
   $dbh->do(qq{
-    CREATE OR REPLACE TRIGGER cd_insert_trg
-    BEFORE INSERT OR UPDATE ON cd
+    CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_pk${q}
+    BEFORE INSERT ON ${q}artist${q}
     FOR EACH ROW
     BEGIN
-      IF :new.cdid IS NULL THEN
-        SELECT cd_seq.nextval
-        INTO :new.cdid
+      IF :new.${q}artistid${q} IS NULL THEN
+        SELECT ${q}artist_pk_seq${q}.nextval
+        INTO :new.${q}artistid${q}
         FROM DUAL;
       END IF;
     END;
   });
+
   $dbh->do(qq{
-    CREATE OR REPLACE TRIGGER cd_insert_trg
-    BEFORE INSERT ON cd
+    CREATE OR REPLACE TRIGGER ${q}cd_insert_trg${q}
+    BEFORE INSERT OR UPDATE ON cd
     FOR EACH ROW
+
+    DECLARE
+    tmpVar NUMBER;
+
     BEGIN
-      IF :new.cdid IS NULL THEN
-        SELECT cd_seq.nextval
-        INTO :new.cdid
-        FROM DUAL;
+      tmpVar := 0;
+
+      IF :new.${q}cdid${q} IS NULL THEN
+        SELECT ${q}cd_seq${q}.nextval
+        INTO tmpVar
+        FROM dual;
+
+        :new.${q}cdid${q} := tmpVar;
       END IF;
     END;
   });
+
   $dbh->do(qq{
-    CREATE OR REPLACE TRIGGER track_insert_trg
-    BEFORE INSERT ON track
+    CREATE OR REPLACE TRIGGER ${q}track_insert_trg${q}
+    BEFORE INSERT ON ${q}track${q}
     FOR EACH ROW
     BEGIN
-      IF :new.trackid IS NULL THEN
-        SELECT track_seq.nextval
-        INTO :new.trackid
+      IF :new.${q}trackid${q} IS NULL THEN
+        SELECT ${q}track_seq${q}.nextval
+        INTO :new.${q}trackid${q}
         FROM DUAL;
       END IF;
     END;
@@ -764,22 +458,37 @@ sub do_creates {
 }
 
 # clean up our mess
+sub do_clean {
+
+  my $dbh = shift || return;
+
+  for my $q ('', '"') {
+    my @clean = (
+      "DROP TRIGGER ${q}track_insert_trg${q}",
+      "DROP TRIGGER ${q}cd_insert_trg${q}",
+      "DROP TRIGGER ${q}artist_insert_trg_auto${q}",
+      "DROP TRIGGER ${q}artist_insert_trg_pk${q}",
+      "DROP SEQUENCE ${q}nonpkid_seq${q}",
+      "DROP SEQUENCE ${q}pkid2_seq${q}",
+      "DROP SEQUENCE ${q}pkid1_seq${q}",
+      "DROP SEQUENCE ${q}track_seq${q}",
+      "DROP SEQUENCE ${q}cd_seq${q}",
+      "DROP SEQUENCE ${q}artist_autoinc_seq${q}",
+      "DROP SEQUENCE ${q}artist_pk_seq${q}",
+      "DROP TABLE ${q}bindtype_test${q}",
+      "DROP TABLE ${q}sequence_test${q}",
+      "DROP TABLE ${q}track${q}",
+      "DROP TABLE ${q}cd${q}",
+      "DROP TABLE ${q}artist${q}",
+    );
+    eval { $dbh -> do ($_) } for @clean;
+  }
+}
+
 END {
-  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");
-    };
-
-    eval { $dbh->do('DROP SYNONYM artist') };
+  if ($dbh) {
+    local $SIG{__WARN__} = sub {};
+    do_clean($dbh);
+    $dbh->disconnect;
   }
 }