From: Peter Rabbitson <ribasushi@cpan.org>
Date: Wed, 4 Nov 2009 09:32:47 +0000 (+0000)
Subject: Merge 'trunk' into 'pg_unqualified_schema'
X-Git-Tag: v0.08113~19^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5861223dc567aba141222cf372590b9086270ec6;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'pg_unqualified_schema'

r7820@Thesaurus (orig r7808):  caelum | 2009-10-21 03:10:39 +0200
add test for populate with literal sql mixed with binds, improve error messages
r7823@Thesaurus (orig r7811):  ribasushi | 2009-10-21 16:33:45 +0200
Show what's wrong with the current populate code
r7824@Thesaurus (orig r7812):  caelum | 2009-10-22 11:10:38 +0200
stringify values passed to populate/insert_bulk
r7825@Thesaurus (orig r7813):  ribasushi | 2009-10-22 13:17:41 +0200
Some smoker run the suite for 30 *minutes* - the timeout seems to be too short for them (boggle)
r7826@Thesaurus (orig r7814):  caelum | 2009-10-22 14:41:37 +0200
a few extra tests can never hurt, right? :)
r7827@Thesaurus (orig r7815):  ribasushi | 2009-10-23 10:51:05 +0200
Prevent sqlt from failing silently
r7828@Thesaurus (orig r7816):  ribasushi | 2009-10-23 10:52:49 +0200
{ is_foreign_key_constraint => 0, on_delete => undef } is a valid construct - no need to carp
r7832@Thesaurus (orig r7820):  robkinyon | 2009-10-26 20:11:22 +0100
Fixed bad if-check in columns()
r7840@Thesaurus (orig r7828):  caelum | 2009-10-31 14:01:56 +0100
change repository in meta to point to real svn url rather than svnweb
r7842@Thesaurus (orig r7830):  caelum | 2009-10-31 21:04:39 +0100
pass sqlite_version to SQLT
r7843@Thesaurus (orig r7831):  caelum | 2009-10-31 21:22:37 +0100
fix regex to numify sqlite_version
r7844@Thesaurus (orig r7832):  caelum | 2009-10-31 23:59:19 +0100
work-around disconnect bug with DBD::Pg 2.15.1
---

5861223dc567aba141222cf372590b9086270ec6
diff --cc lib/DBIx/Class/Storage/DBI/Pg.pm
index ac81048,92f1a78..6397e45
--- a/lib/DBIx/Class/Storage/DBI/Pg.pm
+++ b/lib/DBIx/Class/Storage/DBI/Pg.pm
@@@ -66,7 -73,7 +66,7 @@@ sub _dbh_get_autoinc_seq 
  
    # if no default value is set on the column, or if we can't parse the
    # default value as a sequence, throw.
--  unless ( defined $seq_expr and $seq_expr =~ /^nextval\(+'([^']+)'::(?:text|regclass)\)/i ){
++  unless ( defined $seq_expr and $seq_expr =~ /^nextval\(+'([^']+)'::(?:text|regclass)\)/i ) {
      $seq_expr = '' unless defined $seq_expr;
      $schema = "$schema." if defined $schema && length $schema;
      $self->throw_exception( "no sequence found for $schema$table.$col, check table definition, "