From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 30 May 2010 22:39:14 +0000 (+0000)
Subject: Merge 'trunk' into 'view-deps'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9485509b5b6fa85268a7256a20907e1f698d6af6;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'trunk' into 'view-deps'

r9420@Thesaurus (orig r9406):  caelum | 2010-05-20 16:28:18 +0200
support INSERT OR UPDATE triggers for Oracle
r9421@Thesaurus (orig r9407):  matthewt | 2010-05-20 19:19:14 +0200
don't try and ensure_class_loaded an object. this doesn't work.
r9422@Thesaurus (orig r9408):  matthewt | 2010-05-20 19:36:01 +0200
fix result_class setter behaviour to not stuff attrs (line commented out to prevent this regression being mistakenly re-introduced)
r9423@Thesaurus (orig r9409):  matthewt | 2010-05-20 19:49:32 +0200
forgot to commit fixes
r9424@Thesaurus (orig r9410):  matthewt | 2010-05-20 20:09:52 +0200
fix find() since that was also broken in r8754
r9435@Thesaurus (orig r9421):  rabbit | 2010-05-25 11:14:29 +0200
Fix undef warning
r9436@Thesaurus (orig r9422):  rabbit | 2010-05-25 11:15:01 +0200
Rewrite test as to not propagate several ways to do the same thing
r9452@Thesaurus (orig r9438):  caelum | 2010-05-25 21:33:37 +0200
 r24317@hlagh (orig r9367):  tonvoon | 2010-05-14 12:24:35 -0400
 Branch for converting eval {} to Try::Tiny

 r24319@hlagh (orig r9369):  tonvoon | 2010-05-14 17:25:02 -0400
 Conversion of eval => try (part 1)

 r24325@hlagh (orig r9375):  tonvoon | 2010-05-14 18:03:03 -0400
 Add eval => try

 r24326@hlagh (orig r9376):  tonvoon | 2010-05-14 18:22:57 -0400
 Another eval => try

 r24327@hlagh (orig r9377):  tonvoon | 2010-05-14 18:45:27 -0400
 Corrected usage of $@ in catch block

 r24328@hlagh (orig r9378):  tonvoon | 2010-05-14 19:29:52 -0400
 txn_do's eval => try

 r24329@hlagh (orig r9379):  tonvoon | 2010-05-14 19:46:44 -0400
 eval => try where tests for $@ done

 r24330@hlagh (orig r9380):  tonvoon | 2010-05-14 20:38:43 -0400
 All expected evals converted to try, except where no test is done,
 runtime evaluation, or base perl (such as "require"). Only one test
 failure due to string difference in output

 r24346@hlagh (orig r9396):  tonvoon | 2010-05-17 08:52:28 -0400
 Fix missing $@ in try::tiny conversion

 r24347@hlagh (orig r9397):  tonvoon | 2010-05-17 08:55:13 -0400
 Revert to eval instead of try::tiny because no check for $@

 r24348@hlagh (orig r9398):  tonvoon | 2010-05-17 08:55:45 -0400
 Added myself to contributors

 r24349@hlagh (orig r9399):  tonvoon | 2010-05-17 10:23:57 -0400
 Fixed exception logic due to not being able to use return with a catch{}

 r24350@hlagh (orig r9400):  tonvoon | 2010-05-17 10:31:32 -0400
 Removed tab

 r24430@hlagh (orig r9424):  ribasushi | 2010-05-25 10:09:39 -0400
 More try::tiny conversions
 r24432@hlagh (orig r9426):  ribasushi | 2010-05-25 11:40:45 -0400
 Try::Tiny conversion finished
 r24433@hlagh (orig r9427):  ribasushi | 2010-05-25 11:46:52 -0400
 Missed use
 r24440@hlagh (orig r9434):  rkitover | 2010-05-25 13:47:25 -0400
 fix Oracle
 r24441@hlagh (orig r9435):  rkitover | 2010-05-25 14:04:10 -0400
 fix odbc/mssql dynamic cursors
 r24442@hlagh (orig r9436):  rkitover | 2010-05-25 14:32:41 -0400
 fix hang in SQLAnywhere DateTime tests

r9454@Thesaurus (orig r9440):  rabbit | 2010-05-26 11:28:37 +0200
Simplify oracle retrial logic
r9455@Thesaurus (orig r9441):  rabbit | 2010-05-26 12:00:20 +0200
Can not return from within a try block
r9456@Thesaurus (orig r9442):  rabbit | 2010-05-26 12:17:55 +0200
Really fix logic
r9464@Thesaurus (orig r9450):  jester | 2010-05-27 16:06:43 +0200
Light doc tweaks

r9475@Thesaurus (orig r9461):  ribasushi | 2010-05-31 00:17:29 +0200
Rewrite GenericSubQ from SQLA::L to be actually useful
Since it now works it is no longer necessary to turn on softlimit when genericsubq is detected
Switch all sprintf()ed limit/offset specs to unsigned integers
Lower the default rows-without-offset to 2^32
r9476@Thesaurus (orig r9462):  rabbit | 2010-05-31 00:25:01 +0200
New format of changelog (easier to read)
r9477@Thesaurus (orig r9463):  rabbit | 2010-05-31 00:27:18 +0200
Fix MC double-object creation (important for e.g. IC::FS which otherwise leaves orphaned files)
r9479@Thesaurus (orig r9465):  rabbit | 2010-05-31 00:37:23 +0200
Fix tests to survive the new SQLA bindtype checks
---

9485509b5b6fa85268a7256a20907e1f698d6af6
diff --cc lib/SQL/Translator/Parser/DBIx/Class.pm
index 182206d,ca25aa2..073a45c
--- a/lib/SQL/Translator/Parser/DBIx/Class.pm
+++ b/lib/SQL/Translator/Parser/DBIx/Class.pm
@@@ -263,7 -269,6 +269,7 @@@ sub parse 
      my $dependencies = {
        map { $_ => _resolve_deps ($_, \%tables) } (keys %tables)
      };
-     
++
      for my $table (sort
        {
          keys %{$dependencies->{$a} || {} } <=> keys %{ $dependencies->{$b} || {} }
@@@ -292,20 -297,9 +298,20 @@@ EO
      }
  
      my %views;
-         
 -    foreach my $moniker (sort keys %view_monikers)
++
 +    my @view_sources =
 +    sort {
 +        keys %{ $dependencies->{$a} || {} }
 +        <=>
 +        keys %{ $dependencies->{$b} || {} }
 +        ||
 +        $a cmp $b
 +    }
 +    map { $dbicschema->source($_) }
 +    keys %view_monikers;
 +
 +    foreach my $source (@view_sources)
      {
 -        my $source = $dbicschema->source($moniker);
          my $view_name = $source->name;
  
          # FIXME - this isn't the right way to do it, but sqlt does not