X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle.t;h=45f615295160e30c3e6a4c7284de9bc90d802b03;hb=ab17c17561437a571ef9fc8e75bafbca54afae3c;hp=cf49459bb48372ed10430465bb7095f0e6761cad;hpb=bf51641f97a504ae9796fcc45da4e409c6466ca4;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/73oracle.t b/t/73oracle.t
index cf49459..45f6152 100644
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -5,9 +5,9 @@
   use base 'DBIx::Class::Core';
 
   __PACKAGE__->table(
-    defined $ENV{DBICTEST_ORA_USER}
+    $ENV{DBICTEST_ORA_USER}
       ? (uc $ENV{DBICTEST_ORA_USER}) . '.artist'
-      : 'artist'
+      : '??_no_user_??'
   );
   __PACKAGE__->add_columns(
     'artistid' => {
@@ -40,6 +40,13 @@ use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
+plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_rdbms_oracle')
+  unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_oracle');
+
+$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:
@@ -68,7 +75,7 @@ my @tryopt = (
 );
 
 # keep a database handle open for cleanup
-my $dbh;
+my ($dbh, $dbh2);
 
 # test insert returning
 
@@ -352,6 +359,57 @@ sub _run_tests {
     $schema->storage->debug ($orig_debug);
   }}
 
+# test populate (identity, success and error handling)
+  my $art_rs = $schema->resultset('Artist');
+
+  my $seq_pos = $art_rs->get_column('artistid')->max;
+  ok($seq_pos, 'Starting with something in the artist table');
+
+
+  my $pop_rs = $schema->resultset('Artist')->search(
+    { name => { -like => 'pop_art_%' } },
+    { order_by => 'artistid' }
+  );
+
+  $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'
+  );
 
 # test sequence detection from a different schema
   SKIP: {
@@ -372,18 +430,22 @@ sub _run_tests {
       if $schema->storage->_server_info->{normalized_dbms_version} < 9;
 
     my $schema2 = $schema->connect($dsn2, $user2, $pass2, $opt);
+    my $dbh2 = $schema2->storage->dbh;
 
-    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);
-    $schema1_dbh->do("GRANT SELECT ON ${q}artist_autoinc_seq${q} TO " . uc $user2);
+    # create identically named tables/sequences in the other schema
+    do_creates($dbh2, $q);
 
+    # grand select privileges to the 2nd user
+    $dbh->do("GRANT INSERT 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);
 
-    my $rs = $schema2->resultset('ArtistFQN');
-    delete $rs->result_source->column_info('artistid')->{sequence};
+    # 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 = $rs->create({ name => 'From Different Schema' });
+      my $row = $rs2->create({ name => 'From Different Schema' });
       ok $row->artistid;
     } 'used autoinc sequence across schemas';
 
@@ -392,8 +454,8 @@ sub _run_tests {
       ? '"artist_pk_seq"'
       : '"ARTIST_PK_SEQ"'
     ;
-    delete $rs->result_source->column_info('artistid')->{sequence};
-    $schema1_dbh->do(qq{
+    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
@@ -408,15 +470,31 @@ sub _run_tests {
 
 
     lives_and {
-      my $row = $rs->create({ name => 'From Different Schema With Quoted Sequence' });
+      my $row = $rs2->create({ name => 'From Different Schema With Quoted Sequence' });
       ok $row->artistid;
     } 'used quoted autoinc sequence across schemas';
 
-    my $schema_name = uc $user;
-
-    is_deeply $rs->result_source->column_info('artistid')->{sequence},
-      \qq|${schema_name}.$q_seq|,
+    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);
   }}
 
   do_clean ($dbh);
@@ -450,10 +528,10 @@ sub do_creates {
   $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, ${q}small_dt${q} DATE)");
+  $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("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("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, ${q}a_memo${q} integer NULL)");
 
   $dbh->do(qq{
     CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_auto${q}
@@ -545,9 +623,10 @@ sub do_clean {
 }
 
 END {
-  if ($dbh) {
+  for ($dbh, $dbh2) {
+    next unless $_;
     local $SIG{__WARN__} = sub {};
-    do_clean($dbh);
-    $dbh->disconnect;
+    do_clean($_);
+    $_->disconnect;
   }
 }