[Bast-commits] r3871 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader/DBI t

[ilmari at dev.catalyst.perl.org]

Author: ilmari
Date: 2007-11-09 16:51:36 +0000 (Fri, 09 Nov 2007)
New Revision: 3871

Modified:
   branches/DBIx-Class-Schema-Loader/current/
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
   branches/DBIx-Class-Schema-Loader/current/t/22dump.t
Log:
 r17068 at neodymium (orig r3822):  blblack | 2007-10-19 15:17:47 +0100
 Default Oracle db_schema to db username (patch from Johannes Plunien)
 r17682 at neodymium (orig r3870):  ilmari | 2007-11-09 16:41:45 +0000
 Fix Win32 test skip counts for good (RT #30568, Kenichi Ishigaki)



Property changes on: branches/DBIx-Class-Schema-Loader/current
___________________________________________________________________
Name: svk:merge
   - bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:3801
   + bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:3870

Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2007-11-09 16:41:45 UTC (rev 3870)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2007-11-09 16:51:36 UTC (rev 3871)
@@ -2,6 +2,9 @@
 
 0.04999_01 Not yet released
         - Generate one-to-one accessors for unique foreign keys (ilmari)
+        - Fix Win32 test skip counts for good (RT #30568, Kenichi Ishigaki)
+        - Default Oracle db_schema to db username (patch
+          from Johannes Plunien)
 
 0.04003 Wed Oct 4, 2007
         - Prevent users from running Kwalitee test automatically

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm	2007-11-09 16:41:45 UTC (rev 3870)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm	2007-11-09 16:51:36 UTC (rev 3871)
@@ -32,6 +32,16 @@
 
 =cut
 
+sub _setup {
+    my $self = shift;
+
+    $self->next::method(@_);
+
+    my $dbh = $self->schema->storage->dbh;
+    $self->{db_schema} ||= $dbh->selectrow_array('SELECT USER FROM DUAL', {});
+}
+
+
 sub _table_columns {
     my ($self, $table) = @_;
 

Modified: branches/DBIx-Class-Schema-Loader/current/t/22dump.t
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/t/22dump.t	2007-11-09 16:41:45 UTC (rev 3870)
+++ branches/DBIx-Class-Schema-Loader/current/t/22dump.t	2007-11-09 16:51:36 UTC (rev 3871)
@@ -33,7 +33,12 @@
 DBICTest::Schema::1->_loader_invoked(undef);
 
 SKIP: {
-  skip "ActiveState perl produces additional warnings", 3
+  my @warnings_regexes = (
+      qr|Dumping manual schema|,
+      qr|Schema dump completed|,
+  );
+
+  skip "ActiveState perl produces additional warnings", scalar @warnings_regexes
     if ($^O eq 'MSWin32');
 
   my @warn_output;
@@ -41,10 +46,6 @@
       local $SIG{__WARN__} = sub { push(@warn_output, @_) };
       DBICTest::Schema::1->connect($make_dbictest_db::dsn);
   }
-  my @warnings_regexes = (
-      qr|Dumping manual schema|,
-      qr|Schema dump completed|,
-  );
 
   like(shift @warn_output, $_) foreach (@warnings_regexes);