From: Fabien Wernli <cpan@faxm0dem.org>
Date: Fri, 23 Jul 2010 15:55:19 +0000 (+0200)
Subject: Get Storage::Oracle to behave when quoting is enabled
X-Git-Tag: v0.08125~33
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=07cda1c5a7df6656772dfd65c488c19c15126168;p=dbsrgits%2FDBIx-Class.git

Get Storage::Oracle to behave when quoting is enabled

Also fix Pg being unable to handle scalarref sequences
---

diff --git a/Changes b/Changes
index 09bfebb..49e5617 100644
--- a/Changes
+++ b/Changes
@@ -16,6 +16,7 @@ Revision history for DBIx::Class
           (RT#62642)
         - Fix incomplete logic while detecting correct Oracle sequence
           on insert
+        - Major overhaul of Storage::Oracle to handle enabled quoting
         - Fixed incorrect composition of select/as/columns attributes during
           chaining (RT#61235)
         - Proper serialization of resultsets with open cursors
diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index e14f234..6b6f7dd 100644
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -1594,7 +1594,7 @@ sub _prefetch_autovalues {
       )
     ) {
       $values{$col} = $self->_sequence_fetch(
-        'nextval',
+        'NEXTVAL',
         ( $colinfo->{$col}{sequence} ||=
             $self->_dbh_get_autoinc_seq($self->_get_dbh, $source, $col)
         ),
diff --git a/lib/DBIx/Class/Storage/DBI/InterBase.pm b/lib/DBIx/Class/Storage/DBI/InterBase.pm
index e14277a..fd21056 100644
--- a/lib/DBIx/Class/Storage/DBI/InterBase.pm
+++ b/lib/DBIx/Class/Storage/DBI/InterBase.pm
@@ -38,15 +38,15 @@ __PACKAGE__->sql_limit_dialect ('FirstSkip');
 sub _sequence_fetch {
   my ($self, $nextval, $sequence) = @_;
 
-  if ($nextval ne 'nextval') {
-    $self->throw_exception("Can only fetch 'nextval' for a sequence");
-  }
+  $self->throw_exception("Can only fetch 'nextval' for a sequence")
+    if $nextval !~ /^nextval$/i;
 
   $self->throw_exception('No sequence to fetch') unless $sequence;
 
-  my ($val) = $self->_get_dbh->selectrow_array(
-'SELECT GEN_ID(' . $self->sql_maker->_quote($sequence) .
-', 1) FROM rdb$database');
+  my ($val) = $self->_get_dbh->selectrow_array(sprintf
+    'SELECT GEN_ID(%s, 1) FROM rdb$database',
+    $self->sql_maker->_quote($sequence)
+  );
 
   return $val;
 }
diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
index 40156b6..b255e53 100644
--- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
+++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
@@ -105,7 +105,7 @@ sub _dbh_last_insert_id {
   my @ids = ();
   foreach my $col (@columns) {
     my $seq = ($source->column_info($col)->{sequence} ||= $self->get_autoinc_seq($source,$col));
-    my $id = $self->_sequence_fetch( 'currval', $seq );
+    my $id = $self->_sequence_fetch( 'CURRVAL', $seq );
     push @ids, $id;
   }
   return @ids;
@@ -115,15 +115,20 @@ sub _dbh_get_autoinc_seq {
   my ($self, $dbh, $source, $col) = @_;
 
   my $sql_maker = $self->sql_maker;
+  my ($ql, $qr) = map { $_ ? (quotemeta $_) : '' } $sql_maker->_quote_chars;
 
   my $source_name;
   if ( ref $source->name eq 'SCALAR' ) {
     $source_name = ${$source->name};
+
+    # the ALL_TRIGGERS match further on is case sensitive - thus uppercase
+    # stuff unless it is already quoted
+    $source_name = uc ($source_name) if $source_name !~ /\"/;
   }
   else {
     $source_name = $source->name;
+    $source_name = uc($source_name) unless $ql;
   }
-  $source_name = uc($source_name) unless $sql_maker->quote_char;
 
   # trigger_body is a LONG
   local $dbh->{LongReadLen} = 64 * 1024 if ($dbh->{LongReadLen} < 64 * 1024);
@@ -131,17 +136,18 @@ sub _dbh_get_autoinc_seq {
   # disable default bindtype
   local $sql_maker->{bindtype} = 'normal';
 
+
   # look up the correct sequence automatically
-  my ( $schema, $table ) = $source_name =~ /(\w+)\.(\w+)/;
+  my ( $schema, $table ) = $source_name =~ /( (?:${ql})? \w+ (?:${qr})? ) \. ( (?:${ql})? \w+ (?:${qr})? )/x;
   my ($sql, @bind) = $sql_maker->select (
     'ALL_TRIGGERS',
-    [qw/ trigger_body table_owner trigger_name /],
+    [qw/TRIGGER_BODY TABLE_OWNER TRIGGER_NAME/],
     {
-      $schema ? (owner => $schema) : (),
-      table_name => $table || $source_name,
-      triggering_event => { -like => '%INSERT%' },  # this will also catch insert_or_update
-      trigger_type => { -like => '%BEFORE%' },      # we care only about 'before' triggers
-      status => 'ENABLED',
+      $schema ? (OWNER => $schema) : (),
+      TABLE_NAME => $table || $source_name,
+      TRIGGERING_EVENT => { -like => '%INSERT%' },  # this will also catch insert_or_update
+      TRIGGER_TYPE => { -like => '%BEFORE%' },      # we care only about 'before' triggers
+      STATUS => 'ENABLED',
      },
   );
 
@@ -150,7 +156,7 @@ sub _dbh_get_autoinc_seq {
   my @triggers = ( map
     { my %inf; @inf{qw/body schema name/} = @$_; \%inf }
     ( grep
-      { $_->[0] =~ /\:new\.$col/i }
+      { $_->[0] =~ /\:new\.${ql}${col}${qr} | \:new\.$col/xi }
       @{ $dbh->selectall_arrayref( $sql, {}, @bind ) }
     )
   );
@@ -208,6 +214,7 @@ sub _dbh_get_autoinc_seq {
     $seq_name = "$chosen_trigger->{schema}.$seq_name"
       unless $seq_name =~ /\./;
 
+    return \$seq_name if $seq_name =~ /\"/; # may already be quoted in-trigger
     return $seq_name;
   }
 
@@ -222,7 +229,10 @@ sub _dbh_get_autoinc_seq {
 
 sub _sequence_fetch {
   my ( $self, $type, $seq ) = @_;
-  my ($id) = $self->_get_dbh->selectrow_array("SELECT ${seq}.${type} FROM DUAL");
+
+  # use the maker to leverage quoting settings
+  my $sql_maker = $self->sql_maker;
+  my ($id) = $self->_get_dbh->selectrow_array ($sql_maker->select('DUAL', [ ref $seq ? \"$$seq.$type" : "$seq.$type" ] ) );
   return $id;
 }
 
@@ -376,8 +386,8 @@ sub source_bind_attributes
   my %bind_attributes;
 
   foreach my $column ($source->columns) {
-    my $data_type = $source->column_info($column)->{data_type} || '';
-    next unless $data_type;
+    my $data_type = $source->column_info($column)->{data_type}
+      or next;
 
     my %column_bind_attrs = $self->bind_attribute_by_data_type($data_type);
 
diff --git a/lib/DBIx/Class/Storage/DBI/Pg.pm b/lib/DBIx/Class/Storage/DBI/Pg.pm
index 50a1112..d1319e9 100644
--- a/lib/DBIx/Class/Storage/DBI/Pg.pm
+++ b/lib/DBIx/Class/Storage/DBI/Pg.pm
@@ -68,7 +68,7 @@ sub _sequence_fetch {
   $self->throw_exception('No sequence to fetch') unless $sequence;
 
   my ($val) = $self->_get_dbh->selectrow_array(
-    sprintf ("select %s('%s')", $function, $sequence)
+    sprintf ("select %s('%s')", $function, (ref $sequence eq 'SCALAR') ? $$sequence : $sequence)
   );
 
   return $val;
diff --git a/t/73oracle.t b/t/73oracle.t
index 34b3174..4231127 100644
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -5,24 +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,
-      },
-      'autoinc_col' => {
-          data_type         => 'integer',
-          is_auto_increment => 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');
 
@@ -48,68 +48,104 @@ 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);
 
-note "Oracle Version: " . $schema->storage->_server_info->{dbms_version};
+# 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');
 
-my $dbh = $schema->storage->dbh;
 
-do_creates($dbh);
+##########
+# recyclebin sometimes comes in the way
+my $on_connect_sql = ["ALTER SESSION SET recyclebin = OFF"];
 
-# 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');
+# 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;
 
+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);
+  my $q = $schema -> storage -> sql_maker -> quote_char || '';
+
+  $dbh = $schema->storage->dbh;
+
+  do_creates($dbh, $q);
 
 # test primary key handling with multiple triggers
-my $new = $schema->resultset('Artist')->create({ name => 'foo' });
-is($new->artistid, 1, "Oracle Auto-PK worked for sqlt-like trigger");
+  my ($new, $seq);
 
-like ($new->result_source->column_info('artistid')->{sequence}, qr/\.artist_pk_seq$/, 'Correct PK sequence selected for sqlt-like trigger');
+  $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');
 
-$new = $schema->resultset('CD')->create({ artist => 1, title => 'foo', year => '2003' });
-is($new->cdid, 1, "Oracle Auto-PK worked for custom trigger");
+  $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');
 
-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');
-my $artist_rsrc = $artistfqn_rs->result_source;
+# 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};
+  delete $artist_rsrc->column_info('artistid')->{sequence};
+  $new = $artistfqn_rs->create( { name => 'bar' } );
 
-$new = $artistfqn_rs->create( { name => 'bar' } );
-is( $new->artistid, 2, "Oracle Auto-PK worked with fully-qualified tablename" );
+  is( $new->artistid, 2, "Oracle 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");
+  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');
 
-like ($artist_rsrc->column_info('artistid')->{sequence}, qr/\.artist_pk_seq$/, 'Still correct PK sequence');
 
 # test LIMIT support
-for (1..6) {
+  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" );
+  }
+  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" );
+
+
+# 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';
 
-my $cd = $schema->resultset('CD')->create({ artist => 1, title => 'EP C', year => '2003' });
-is($cd->cdid, 2, "Oracle Auto-PK worked - using scalar ref as table name");
 
 # test rel names over the 30 char limit
-{
   my $query = $schema->resultset('Artist')->search({
     artistid => 1
   }, {
@@ -117,7 +153,7 @@ is($cd->cdid, 2, "Oracle Auto-PK worked - using scalar ref as table name");
   });
 
   lives_and {
-    is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 2
+    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
@@ -135,289 +171,286 @@ is($cd->cdid, 2, "Oracle Auto-PK worked - using scalar ref as table name");
       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({ 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);
+
+  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({ cd => $cd->cdid, 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');
 
-{
-  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',
-      rows => 3,
-      offset => 0,
-    })->all;
-    ok( scalar @results > 0, 'limit with long identifiers returned something');
-  } 'limit with long identifiers executed successfully';
-}
+# 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'
+  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';
+  } 'with_deferred_fk_checks code survived';
 
-is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track',
-   'code in with_deferred_fk_checks worked'; 
+  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';
 
-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");
+
 
 # test BLOBs
-SKIP: {
-  my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
-  $binstr{'large'} = $binstr{'small'} x 1024;
+  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;
+    my $maxloblen = length $binstr{'large'};
+    note "Localizing LongReadLen to $maxloblen to avoid truncation of test data";
+    local $dbh->{'LongReadLen'} = $maxloblen;
 
-  my $rs = $schema->resultset('BindType');
-  my $id = 0;
+    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';
+    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;
-  }
+      skip 'buggy BLOB support in DBD::Oracle 1.23', 7;
+    }
 
-  # disable BLOB mega-output
-  my $orig_debug = $schema->storage->debug;
-  $schema->storage->debug (0);
+    # disable BLOB mega-output
+    my $orig_debug = $schema->storage->debug;
+    $schema->storage->debug (0);
 
-  foreach my $type (qw( blob clob )) {
-    foreach my $size (qw( small large )) {
-      $id++;
+    local $TODO = 'Something is confusing column bindtype assignment when quotes are active'
+      if $q;
 
-      lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) }
-      "inserted $size $type without dying";
+    foreach my $type (qw( blob clob )) {
+      foreach my $size (qw( small large )) {
+        $id++;
 
-      ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" );
+        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" );
+      }
     }
-  }
 
-  $schema->storage->debug ($orig_debug);
-}
+    $schema->storage->debug ($orig_debug);
+  }}
+
 
 # test sequence detection from a different schema
-my $schema2;
-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;
+  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;
+    # 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;
 
-  $schema2 = DBICTest::Schema->connect($dsn2, $user2, $pass2);
+    my $schema2 = DBICTest::Schema->connect($dsn2, $user2, $pass2, $opt);
 
-  my $schema1_dbh  = $schema->storage->dbh;
 
-  $schema1_dbh->do("GRANT INSERT ON artist TO $user2");
-  $schema1_dbh->do("GRANT SELECT ON artist_pk_seq TO $user2");
+    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');
 
-  # first test with unquoted (default) sequence name in trigger body
+    my $rs = $schema2->resultset('ArtistFQN');
+    delete $rs->result_source->column_info('artistid')->{sequence};
 
-  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_pk
-    BEFORE INSERT ON artist
-    FOR EACH ROW
-    BEGIN
-      IF :new.artistid IS NULL THEN
-        SELECT "ARTIST_PK_SEQ".nextval
-        INTO :new.artistid
-        FROM DUAL;
-      END IF;
-    END;
-  });
+    # 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;
+    });
 
-  # 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';
+    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;
+    my $schema_name = uc $user;
 
-  is $rs->result_source->column_info('artistid')->{sequence},
-    qq[${schema_name}."ARTIST_PK_SEQ"],
-    'quoted sequence name correctly extracted';
-} }
+    is_deeply $rs->result_source->column_info('artistid')->{sequence},
+      \qq|${schema_name}.$q_seq|,
+      'quoted sequence name correctly extracted';
+  }}
+
+  do_clean ($dbh);
+}
 
 done_testing;
 
 sub do_creates {
-  my $dbh = shift;
-
-  eval {
-    $dbh->do("DROP SEQUENCE artist_autoinc_seq");
-    $dbh->do("DROP SEQUENCE artist_pk_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_autoinc_seq START WITH 1 MAXVALUE 999999 MINVALUE 0");
-  $dbh->do("CREATE SEQUENCE artist_pk_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), name VARCHAR(255), autoinc_col NUMBER(12), 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 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 ${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 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))");
+  # 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 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}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 bindtype_test (id integer NOT NULL PRIMARY KEY, bytea integer NULL, blob blob NULL, clob clob NULL)");
+  $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_auto
-    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.autoinc_col IS NULL THEN
-        SELECT artist_autoinc_seq.nextval
-        INTO :new.autoinc_col
+      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 artist_insert_trg_pk
-    BEFORE INSERT ON artist
+    CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_pk${q}
+    BEFORE INSERT ON ${q}artist${q}
     FOR EACH ROW
     BEGIN
-      IF :new.artistid IS NULL THEN
-        SELECT artist_pk_seq.nextval
-        INTO :new.artistid
+      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
+    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.cdid IS NULL THEN
-        SELECT cd_seq.nextval
+      IF :new.${q}cdid${q} IS NULL THEN
+        SELECT ${q}cd_seq${q}.nextval
         INTO tmpVar
         FROM dual;
 
-        :new.cdid := tmpVar;
+        :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;
@@ -425,21 +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_autoinc_seq");
-      $dbh->do("DROP SEQUENCE artist_pk_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");
-    };
+  if ($dbh) {
+    local $SIG{__WARN__} = sub {};
+    do_clean($dbh);
+    $dbh->disconnect;
   }
 }
diff --git a/t/750firebird.t b/t/750firebird.t
index 49443b2..3618edf 100644
--- a/t/750firebird.t
+++ b/t/750firebird.t
@@ -75,11 +75,11 @@ EOF
 EOF
   $dbh->do('ALTER TABLE "sequence_test" ADD CONSTRAINT "sequence_test_constraint" PRIMARY KEY ("pkid1", "pkid2")');
   eval { $dbh->do('DROP GENERATOR "pkid1_seq"') };
-  eval { $dbh->do('DROP GENERATOR "pkid2_seq"') };
+  eval { $dbh->do('DROP GENERATOR pkid2_seq') };
   eval { $dbh->do('DROP GENERATOR "nonpkid_seq"') };
   $dbh->do('CREATE GENERATOR "pkid1_seq"');
-  $dbh->do('CREATE GENERATOR "pkid2_seq"');
-  $dbh->do('SET GENERATOR "pkid2_seq" TO 9');
+  $dbh->do('CREATE GENERATOR pkid2_seq');
+  $dbh->do('SET GENERATOR pkid2_seq TO 9');
   $dbh->do('CREATE GENERATOR "nonpkid_seq"');
   $dbh->do('SET GENERATOR "nonpkid_seq" TO 19');
 
@@ -272,9 +272,13 @@ sub cleanup {
   eval { $dbh->do('DROP TRIGGER "artist_bi"') };
   diag $@ if $@;
 
-  foreach my $generator (qw/gen_artist_artistid pkid1_seq pkid2_seq
-                            nonpkid_seq/) {
-    eval { $dbh->do(qq{DROP GENERATOR "$generator"}) };
+  foreach my $generator (qw/
+    "gen_artist_artistid"
+    "pkid1_seq"
+    pkid2_seq
+    "nonpkid_seq"
+  /) {
+    eval { $dbh->do(qq{DROP GENERATOR $generator}) };
     diag $@ if $@;
   }
 
diff --git a/t/lib/DBICTest/Schema/SequenceTest.pm b/t/lib/DBICTest/Schema/SequenceTest.pm
index b0fa515..cb5203f 100644
--- a/t/lib/DBICTest/Schema/SequenceTest.pm
+++ b/t/lib/DBICTest/Schema/SequenceTest.pm
@@ -14,12 +14,12 @@ __PACKAGE__->add_columns(
   'pkid1' => {
     data_type => 'integer',
     auto_nextval => 1,
-    sequence => 'pkid1_seq',
+    sequence => \'"pkid1_seq"',
   },
   'pkid2' => {
     data_type => 'integer',
     auto_nextval => 1,
-    sequence => 'pkid2_seq',
+    sequence => \'pkid2_seq',
   },
   'nonpkid' => {
     data_type => 'integer',