From: Matt S Trout Date: Fri, 3 Mar 2006 15:35:41 +0000 (+0000) Subject: Merge 'trunk' into 'DBIx-Class-current' X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=39e45539f3373a1f84da5cbefc5b9919484ee384;p=dbsrgits%2FDBIx-Class-Historic.git Merge 'trunk' into 'DBIx-Class-current' r8257@obrien (orig r996): ningu | 2006-03-01 04:42:50 +0000 try to fix PK::Auto::Pg for sequences with quoted names r8259@obrien (orig r998): blblack | 2006-03-01 05:38:51 +0000 dbh->{InactiveDestroy} when reconnecting in child process (prevents auto-disconnecting a dbh still in use by the parent) r8260@obrien (orig r999): blblack | 2006-03-01 05:58:00 +0000 t/50fork.t made a little more resilient r8261@obrien (orig r1000): jguenther | 2006-03-01 08:34:34 +0000 - Changed documentation to use txn_do() for transactions - Fixed Storage::DBI trace such that each bind parameter is quoted on output, separated by commas - Fixed a couple typos in documentation r8263@obrien (orig r1002): zarquon | 2006-03-02 02:10:03 +0000 Altered example to populate the db with DBIC r8264@obrien (orig r1003): zarquon | 2006-03-02 02:11:07 +0000 Moved Example.pod to ExampleSchema.pod r8265@obrien (orig r1004): zarquon | 2006-03-02 02:12:24 +0000 Fixed a typo in the SQL::Translator section (missing comma in has assignment) r8266@obrien (orig r1005): blblack | 2006-03-02 11:29:53 +0000 add update_or_create proxy method r8269@obrien (orig r1008): zarquon | 2006-03-03 00:24:49 +0000 Changed the name of CD class to Cd to be compatible with default SchemaLoader monikerization r8273@obrien (orig r1011): matthewt | 2006-03-03 15:18:27 +0000 Fix to update(\%args) with inflation from test case by Peter Rabbitson r8274@obrien (orig r1012): matthewt | 2006-03-03 15:23:14 +0000 Missing svk add, as usual r8275@obrien (orig r1013): matthewt | 2006-03-03 15:35:13 +0000 MANIFEST nuked out of repo --- 39e45539f3373a1f84da5cbefc5b9919484ee384 diff --cc lib/DBIx/Class.pm index 98054c0,77fddc2..e638295 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@@ -166,8 -164,8 +166,10 @@@ Scotty Allen + + Justin Guenther + =head1 LICENSE You may distribute this code under the same terms as Perl itself. diff --cc lib/DBIx/Class/Storage/DBI.pm index 657c919,b415445..0a3e9c4 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@@ -412,11 -399,11 +420,11 @@@ sub _execute my ($sql, @bind) = $self->sql_maker->$op($ident, @args); unshift(@bind, @$extra_bind) if $extra_bind; if ($self->debug) { - my @debug_bind = map { defined $_ ? $_ : 'NULL' } @bind; - $self->debugfh->print("$sql: @debug_bind\n"); + my @debug_bind = map { defined $_ ? qq{`$_'} : q{`NULL'} } @bind; + $self->debugfh->print("$sql: " . join(', ', @debug_bind) . "\n"); } my $sth = $self->sth($sql,$op); - croak "no sth generated via sql: $sql" unless $sth; + $self->throw_exception("no sth generated via sql: $sql") unless $sth; @bind = map { ref $_ ? ''.$_ : $_ } @bind; # stringify args my $rv; if ($sth) {