X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=t%2F73oracle.t;h=e7096ea4d4fd32c2099f0aacffa764f7a842f63c;hp=4b51e626be677d2d4d94042d5aa5279e4945dd5e;hb=4c90556806f286093d0806e858abdba329e6dfd3;hpb=d7f20fdf18a715c90597dd65167d4dafaac7c69f

diff --git a/t/73oracle.t b/t/73oracle.t
index 4b51e62..e7096ea 100644
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -1,3 +1,25 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'test_rdbms_oracle';
+
+use strict;
+use warnings;
+
+use Test::Exception;
+use Test::More;
+use Try::Tiny;
+use DBIx::Class::_Util 'set_subname';
+
+use DBICTest;
+
+$ENV{NLS_SORT} = "BINARY";
+$ENV{NLS_COMP} = "BINARY";
+$ENV{NLS_LANG} = "AMERICAN";
+
+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/};
+
 {
   package    # hide from PAUSE
     DBICTest::Schema::ArtistFQN;
@@ -5,270 +27,678 @@
   use base 'DBIx::Class::Core';
 
   __PACKAGE__->table(
-      defined $ENV{DBICTEST_ORA_USER}
-      ? $ENV{DBICTEST_ORA_USER} . '.artist'
-      : 'artist'
+    $ENV{DBICTEST_ORA_USER}
+      ? (uc $ENV{DBICTEST_ORA_USER}) . '.artist'
+      : '??_no_user_??'
   );
   __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,
+    },
+    'default_value_col' => {
+      data_type           => 'varchar',
+      size                => 100,
+      is_nullable         => 0,
+      retrieve_on_insert  => 1,
+    }
   );
-  __PACKAGE__->set_primary_key('artistid');
+  __PACKAGE__->set_primary_key(qw/ artistid autoinc_col /);
 
   1;
 }
 
-use strict;
-use warnings;
-
-use Test::Exception;
-use Test::More;
-use lib qw(t/lib);
-use DBICTest;
+DBICTest::Schema->load_classes('ArtistFQN');
 
-my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_ORA_${_}" } qw/DSN USER PASS/};
+# 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');
 
-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\''
-  unless ($dsn && $user && $pass);
 
-DBICTest::Schema->load_classes('ArtistFQN');
-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 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 cd");
-  $dbh->do("DROP TABLE track");
+# check if we indeed do support stuff
+my $v = do {
+  my $si = DBICTest::Schema->connect($dsn, $user, $pass)->storage->_server_info;
+  $si->{normalized_dbms_version}
+    or die "Unparseable Oracle server version: $si->{dbms_version}\n";
 };
-$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 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), 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), genreid NUMBER(12), single_track NUMBER(12))");
-$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 cd ADD (CONSTRAINT cd_pk PRIMARY KEY (cdid))");
-$dbh->do("ALTER TABLE sequence_test ADD (CONSTRAINT sequence_test_constraint PRIMARY KEY (pkid1, pkid2))");
-$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;
-});
 
-{
-    # Swiped from t/bindtype_columns.t to avoid creating my own Resultset.
+my $test_server_supports_only_orajoins = $v < 9;
 
-    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 });
+# TODO find out which version supports the RETURNING syntax
+# 8i (8.1) has it and earlier docs are a 404 on oracle.com
+my $test_server_supports_insert_returning = $v >= 8.001;
+
+is (
+  DBICTest::Schema->connect($dsn, $user, $pass)->storage->_use_insert_returning,
+  $test_server_supports_insert_returning,
+  'insert returning capability guessed correctly'
+);
+
+isa_ok (DBICTest::Schema->connect($dsn, $user, $pass)->storage->sql_maker, 'DBIx::Class::SQLMaker::Oracle');
+
+# see if determining a driver with bad credentials throws propely
+throws_ok {
+  DBICTest::Schema->connect($dsn, "BORKED BORKED USER $user", $pass)->storage->sql_maker;
+} qr/DBI Connection failed/;
+
+##########
+# the recyclebin (new for 10g) sometimes comes in the way
+my $on_connect_sql = $v >= 10 ? ["ALTER SESSION SET recyclebin = OFF"] : [];
+
+# iterate all tests on following options
+my @tryopt = (
+  { on_connect_do => $on_connect_sql },
+  { quote_char => '"', on_connect_do => $on_connect_sql },
+);
+
+# keep a database handle open for cleanup
+my ($dbh, $dbh2);
+
+my $schema;
+for my $use_insert_returning ($test_server_supports_insert_returning ? (1,0) : (0) ) {
+  for my $force_ora_joins ($test_server_supports_only_orajoins ? (0) : (0,1) ) {
+
+    # doing it here instead of the actual class to keep the main thing under dfs
+    # and thus keep catching false positives (so far none, but one never knows)
+    mro::set_mro("DBICTest::Schema", "c3");
+
+    my $old_connection = DBICTest::Schema->can('connection');
+
+    no warnings qw/once redefine/;
+    local *DBICTest::Schema::connection = set_subname 'DBICTest::Schema::connection' => sub {
+      my $s = shift->$old_connection (@_);
+      $s->storage->_use_insert_returning ($use_insert_returning);
+      $s->storage->sql_maker_class('DBIx::Class::SQLMaker::OracleJoins') if $force_ora_joins;
+      $s;
+    };
+
+    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 $schema = DBICTest::Schema->connect($dsn, $user, $pass, $opt);
+
+      $dbh = $schema->storage->dbh;
+      my $q = $schema->storage->sql_maker->quote_char || '';
+
+      do_creates($dbh, $q);
+
+      _run_tests($schema, $opt);
+    }
+  }
 }
 
-# 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');
+sub _run_tests {
+  my ($schema, $opt) = @_;
 
-# test primary key handling
-my $new = $schema->resultset('Artist')->create({ name => 'foo' });
-is($new->artistid, 1, "Oracle Auto-PK worked");
+  my $q = $schema->storage->sql_maker->quote_char || '';
 
-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");
+# test primary key handling with multiple triggers
+  my ($new, $seq);
 
-# 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" );
+  my $new_artist = $schema->resultset('Artist')->create({ name => 'foo' });
+  my $new_cd     = $schema->resultset('CD')->create({ artist => 1, title => 'EP C', year => '2003' });
 
-# 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';
+  SKIP: {
+    skip 'not detecting sequences when using INSERT ... RETURNING', 4
+      if $schema->storage->_use_insert_returning;
+
+    is($new_artist->artistid, 1, "Oracle Auto-PK worked for standard sqlt-like trigger");
+    $seq = $new_artist->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');
+
+    is($new_cd->cdid, 1, 'Oracle Auto-PK worked - using scalar ref as table name/custom weird trigger');
+    $seq = $new_cd->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');
+  }
+
+# test PKs again with fully-qualified table name
+  my $artistfqn_rs = $schema->resultset('ArtistFQN');
+  my $artist_rsrc = $artistfqn_rs->result_source;
+
+  delete $artist_rsrc->column_info('artistid')->{sequence};
+  $new = $artistfqn_rs->create( { name => 'bar' } );
+
+  is_deeply( {map { $_ => $new->$_ } $artist_rsrc->primary_columns},
+    { artistid => 2, autoinc_col => 2},
+    "Oracle Multi-Auto-PK worked with fully-qualified tablename" );
+
+
+  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");
+
+
+  is( $new->default_value_col, 'default_value', $schema->storage->_use_insert_returning
+    ? 'Check retrieve_on_insert on default_value_col with INSERT ... RETURNING'
+    : 'Check retrieve_on_insert on default_value_col without INSERT ... RETURNING'
+  );
+
+  SKIP: {
+    skip 'not detecting sequences when using INSERT ... RETURNING', 1
+      if $schema->storage->_use_insert_returning;
+
+    $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 LIMIT support
+  for (1..6) {
+    $schema->resultset('Artist')->create({ name => 'Artist ' . $_ });
+  }
+  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" );
 
-  $query = $schema->resultset('Artist')->search({
-    'cds_very_very_very_long_relationship_name.title' => 'EP C'
+# 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 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 and user condition survived and worked';
-}
+  } 'query with rel name over 30 chars survived and worked';
+
+# test rel names over the 30 char limit using group_by and join
+  {
+    my @group_cols = ( 'me.name' );
+    my $query = $schema->resultset('Artist')->search({
+      artistid => 1
+    }, {
+      select => \@group_cols,
+      as => [map { /^\w+\.(\w+)$/ } @group_cols],
+      join => [qw( cds_very_very_very_long_relationship_name )],
+      group_by => \@group_cols,
+    });
+
+    lives_and {
+      my @got = $query->get_column('name')->all();
+      is_deeply \@got, [$new_artist->name];
+    } 'query with rel name over 30 chars worked on join, group_by for me col';
+
+    lives_and {
+      is $query->count(), 1
+    } 'query with rel name over 30 chars worked on join, group_by, count for me col';
+  }
+  {
+    my @group_cols = ( 'cds_very_very_very_long_relationship_name.title' );
+    my $query = $schema->resultset('Artist')->search({
+      artistid => 1
+    }, {
+      select => \@group_cols,
+      as => [map { /^\w+\.(\w+)$/ } @group_cols],
+      join => [qw( cds_very_very_very_long_relationship_name )],
+      group_by => \@group_cols,
+    });
+
+    lives_and {
+      my @got = $query->get_column('title')->all();
+      is_deeply \@got, [$new_cd->title];
+    } 'query with rel name over 30 chars worked on join, group_by for long rel col';
+
+    lives_and {
+      is $query->count(), 1
+    } 'query with rel name over 30 chars worked on join, group_by, count for long rel col';
+  }
+
+  # rel name over 30 char limit with user condition
+  # This requires walking the SQLA data structure.
+  {
+    $query = $schema->resultset('Artist')->search({
+      'cds_very_very_very_long_relationship_name.title' => 'EP C'
+    }, {
+      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 and user condition survived and worked';
+  }
+
 
 # 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
+  });
 
-my $track = $schema->resultset('Track')->create({ trackid => 1, cd => 1,
-    position => 1, title => 'Track1' });
-my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'},
-        { join => 'cd',
-          rows => 2 }
-);
+  ok(my $row = $tjoin->next);
+
+  is($row->title, 'Track1', "ambiguous column ok");
 
-ok(my $row = $tjoin->next);
 
-is($row->title, 'Track1', "ambiguous column ok");
 
 # check count distinct with multiple columns
-my $other_track = $schema->resultset('Track')->create({ trackid => 2, cd => 1, position => 1, title => 'Track2' });
+  my $other_track = $schema->resultset('Track')->create({ cd => $cd->cdid, position => 1, title => 'Track2' });
 
-my $tcount = $schema->resultset('Track')->search(
-  {},
-  {
-    select => [ qw/position title/ ],
-    distinct => 1,
-  }
-);
-is($tcount->count, 2, 'multiple column COUNT DISTINCT ok');
+  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');
+  $tcount = $schema->resultset('Track')->search(
+    {},
+    {
+      columns => [ qw/position title/ ],
+      distinct => 1,
+    }
+  );
+  is($tcount->count, 2, 'multiple column COUNT DISTINCT ok');
 
-$tcount = $schema->resultset('Track')->search(
-  {},
-  {
-     group_by => [ qw/position title/ ]
-  }
-);
-is($tcount->count, 2, 'multiple column COUNT DISTINCT using column syntax ok');
+  $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) {
-    $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 $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" );
-}
+# 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 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';
+
 
 # test auto increment using sequences WITHOUT triggers
-for (1..5) {
+  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");
+  }
+  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: {
-  skip 'buggy BLOB support in DBD::Oracle 1.23', 8
-    if $DBD::Oracle::VERSION == 1.23;
 
-  my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
-  $binstr{'large'} = $binstr{'small'} x 1024;
+# test populate (identity, success and error handling)
+  my $art_rs = $schema->resultset('Artist');
 
-  my $maxloblen = length $binstr{'large'};
-  note "Localizing LongReadLen to $maxloblen to avoid truncation of test data";
-  local $dbh->{'LongReadLen'} = $maxloblen;
+  my $seq_pos = $art_rs->get_column('artistid')->max;
+  ok($seq_pos, 'Starting with something in the artist table');
 
-  my $rs = $schema->resultset('BindType');
-  my $id = 0;
 
-  foreach my $type (qw( blob clob )) {
-    foreach my $size (qw( small large )) {
-      $id++;
+  my $pop_rs = $schema->resultset('Artist')->search(
+    { name => { -like => 'pop_art_%' } },
+    { order_by => 'artistid' }
+  );
 
-      lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) }
-      "inserted $size $type without dying";
+  $art_rs->delete;
+  lives_ok {
+    $pop_rs->populate([
+      map { +{ name => "pop_art_$_" } }
+      (1,2,3)
+    ]);
+
+    is_deeply (
+      [ $pop_rs->get_column('artistid')->all ],
+      [ map { $seq_pos + $_ } (1,2,3) ],
+      'Sequence works after empty-table insertion'
+    );
+  } 'Populate without identity does not throw';
+
+  lives_ok {
+    $pop_rs->populate([
+      map { +{ artistid => $_, name => "pop_art_$_" } }
+      (1,2,3)
+    ]);
+
+    is_deeply (
+      [ $pop_rs->get_column('artistid')->all ],
+      [ 1,2,3, map { $seq_pos + $_ } (1,2,3) ],
+      'Explicit id population works'
+    );
+  } 'Populate with identity does not throw';
+
+  throws_ok {
+    $pop_rs->populate([
+      map { +{ artistid => $_, name => "pop_art_$_" } }
+      (200, 1, 300)
+    ]);
+  } qr/unique constraint.+populate slice.+name => "pop_art_1"/s, 'Partially failed populate throws';
+
+  is_deeply (
+    [ $pop_rs->get_column('artistid')->all ],
+    [ 1,2,3, map { $seq_pos + $_ } (1,2,3) ],
+    'Partially failed populate did not alter table contents'
+  );
 
-      ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" );
-    }
+# test complex join (exercise orajoins)
+  lives_ok { is_deeply (
+    $schema->resultset('CD')->search(
+      { 'artist.name' => 'pop_art_1', 'me.cdid' => { '!=', 999} },
+      { join => 'artist', prefetch => 'tracks', rows => 4, order_by => 'tracks.trackid' }
+    )->all_hri,
+    [{
+      artist => 1,
+      cdid => 1,
+      genreid => undef,
+      single_track => undef,
+      title => "EP C",
+      tracks => [
+        {
+          cd => 1,
+          last_updated_at => undef,
+          last_updated_on => undef,
+          position => 1,
+          title => "Track1",
+          trackid => 1
+        },
+        {
+          cd => 1,
+          last_updated_at => undef,
+          last_updated_on => undef,
+          position => 1,
+          title => "Track2",
+          trackid => 2
+        },
+      ],
+      year => 2003
+    }],
+    'Correct set of data prefetched',
+  ) } 'complex prefetch ok';
+
+# test sequence detection from a different schema
+  SKIP: {
+  TODO: {
+    skip ((join '',
+      'Set DBICTEST_ORA_EXTRAUSER_DSN, _USER and _PASS to a *DIFFERENT* Oracle user',
+      ' to run the cross-schema sequence detection test.'),
+    1) unless $dsn2 && $user2 && $user2 ne $user;
+
+    skip 'not detecting cross-schema sequence name when using INSERT ... RETURNING', 1
+      if $schema->storage->_use_insert_returning;
+
+    # 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
+    todo_skip "FIXME: On Oracle8i all_triggers view is empty, i don't yet know why...", 1
+      if $schema->storage->_server_info->{normalized_dbms_version} < 9;
+
+    my $schema2 = $schema->connect($dsn2, $user2, $pass2, $opt);
+    my $dbh2 = $schema2->storage->dbh;
+
+    # create identically named tables/sequences in the other schema
+    do_creates($dbh2, $q);
+
+    # grant select privileges to the 2nd user
+    $dbh->do("GRANT INSERT ON ${q}artist${q} TO " . uc $user2);
+    $dbh->do("GRANT SELECT ON ${q}artist${q} TO " . uc $user2);
+    $dbh->do("GRANT SELECT ON ${q}artist_pk_seq${q} TO " . uc $user2);
+    $dbh->do("GRANT SELECT ON ${q}artist_autoinc_seq${q} TO " . uc $user2);
+
+    # test with a fully qualified table (user1/schema prepended)
+    my $rs2 = $schema2->resultset('ArtistFQN');
+    delete $rs2->result_source->column_info('artistid')->{sequence};
+
+    lives_and {
+      my $row = $rs2->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 $rs2->result_source->column_info('artistid')->{sequence};
+    $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;
+    });
+
+
+    lives_and {
+      my $row = $rs2->create({ name => 'From Different Schema With Quoted Sequence' });
+      ok $row->artistid;
+    } 'used quoted autoinc sequence across schemas';
+
+    is_deeply $rs2->result_source->column_info('artistid')->{sequence},
+      \( (uc $user) . ".$q_seq"),
+      'quoted sequence name correctly extracted';
+
+    # try an insert operation on the default user2 artist
+    my $art1 = $schema->resultset('Artist');
+    my $art2 = $schema2->resultset('Artist');
+    my $art1_count = $art1->count || 0;
+    my $art2_count = $art2->count;
+
+    is( $art2_count, 0, 'No artists created yet in second schema' );
+
+    delete $art2->result_source->column_info('artistid')->{sequence};
+    my $new_art = $art2->create({ name => '2nd best' });
+
+    is ($art1->count, $art1_count, 'No new rows in main schema');
+    is ($art2->count, 1, 'One artist create in 2nd schema');
+
+    is( $new_art->artistid, 1, 'Expected first PK' );
+
+    do_clean ($dbh2);
+  }}
+
+# test driver determination issues that led to the diagnosis/fix in 37b5ab51
+# observed side-effect when count-is-first on a fresh env-based connect
+  {
+    local $ENV{DBI_DSN};
+    ($ENV{DBI_DSN}, my @user_pass_args) = @{ $schema->storage->connect_info };
+    my $s2 = DBICTest::Schema->connect( undef, @user_pass_args );
+    ok (! $s2->storage->connected, 'Not connected' );
+    is (ref $s2->storage, 'DBIx::Class::Storage::DBI', 'Undetermined driver' );
+
+    ok (
+      $s2->resultset('Artist')->search({ 'me.name' => { like => '%' } }, { prefetch => 'cds' })->count,
+      'Some artist count'
+    );
+    ok (
+      scalar $s2->resultset('CD')->search({}, { join => 'tracks' } )->all,
+      'Some cds returned'
+    );
+    $s2->storage->disconnect;
   }
+
+  do_clean ($dbh);
 }
 
 done_testing;
 
+sub do_creates {
+  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 TABLE ${q}artist${q} (${q}artistid${q} NUMBER(12), ${q}name${q} VARCHAR(255),${q}default_value_col${q} VARCHAR(255) DEFAULT 'default_value', ${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}))");
+
+  # 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 ${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)");
+  $dbh->do("ALTER TABLE ${q}track${q} ADD (CONSTRAINT ${q}track_pk${q} PRIMARY KEY (${q}trackid${q}))");
+
+  $dbh->do(qq{
+    CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_auto${q}
+    BEFORE INSERT ON ${q}artist${q}
+    FOR EACH ROW
+    BEGIN
+      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 ${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}artist_pk_seq${q}.nextval
+        INTO :new.${q}artistid${q}
+        FROM DUAL;
+      END IF;
+    END;
+  });
+
+  $dbh->do(qq{
+    CREATE OR REPLACE TRIGGER ${q}cd_insert_trg${q}
+    BEFORE INSERT OR UPDATE ON cd
+    FOR EACH ROW
+
+    DECLARE
+    tmpVar NUMBER;
+
+    BEGIN
+      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 ${q}track_insert_trg${q}
+    BEFORE INSERT ON ${q}track${q}
+    FOR EACH ROW
+    BEGIN
+      IF :new.${q}trackid${q} IS NULL THEN
+        SELECT ${q}track_seq${q}.nextval
+        INTO :new.${q}trackid${q}
+        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 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 cd");
-        $dbh->do("DROP TABLE track");
-        $dbh->do("DROP TABLE bindtype_test");
-    }
+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 ($dbh, $dbh2) {
+    next unless $_;
+    local $SIG{__WARN__} = sub {};
+    do_clean($_);
+  }
+  undef $dbh;
+  undef $dbh2;
+}