[Jifty-commit] r835 - in Jifty-DBI/trunk: . lib/Jifty/DBI

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Tue Apr 11 13:33:44 2006
New Revision: 835

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
   Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm

Log:
 r12265 at zoq-fot-pik:  chmrr | 2006-04-11 13:33:31 -0400
  * Use croak to produce more useful errors
  * Fix sequence regex to work with both 8.1 and 7.x


Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	Tue Apr 11 13:33:44 2006
@@ -52,6 +52,7 @@
 
 use Data::Page;
 use Clone;
+use Carp qw/croak/;
 use base qw/Class::Accessor/;
 __PACKAGE__->mk_accessors(qw/pager/);
 
@@ -666,9 +667,9 @@
     my ($Alias);
 
     # We need to be passed a column and a value, at very least
-    die "Must provide a column to limit"
+    croak "Must provide a column to limit"
         unless defined $args{column};
-    die "Must provide a value to limit to"
+    croak "Must provide a value to limit to"
         unless defined $args{value};
 
     #since we're changing the search criteria, we need to redo the search

Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm	Tue Apr 11 13:33:44 2006
@@ -95,7 +95,7 @@
         # Regexp from DBIx::Class's Pg handle. Thanks to Marcus Ramberg
         if ( defined $foo->{'COLUMN_DEF'}
             && $foo->{'COLUMN_DEF'}
-            =~ m!^nextval\(\('"?([^"']+)"?'::(?:text|regclass)\).*\)!i )
+            =~ m!^nextval\(+'"?([^"']+)"?'(::(?:text|regclass)\))+!i )
         {
             return $self->{'_sequences'}{$table} = $1;
         }