gutted Pg storage driver's sequence discovery to just rely on DBD::Pg's last_insert_i...

[dbsrgits/DBIx-Class-Historic.git] / lib / DBIx / Class / ResultSet.pm

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 9f628b2..31bc5b4 100644 (file)
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -1796,7 +1796,10 @@ sub populate {
   } else {
     my ($first, @rest) = @$data;
 
-    my @names = grep {!ref $first->{$_}} keys %$first;
+    my @names = grep {
+      (not ref $first->{$_}) || (ref $first->{$_} eq 'SCALAR')
+    } keys %$first;
+
     my @rels = grep { $self->result_source->has_relationship($_) } keys %$first;
     my @pks = $self->result_source->primary_columns;
 
@@ -2564,13 +2567,19 @@ sub clear_cache {
   shift->set_cache(undef);
 }
 
-=head2 is_paginated
+=head2 is_paged
+
+=over 4
 
-Returns true if the resultset has been paginated
+=item Arguments: none
+
+=item Return Value: true, if the resultset has been paginated
+
+=back
 
 =cut
 
-sub is_paginated {
+sub is_paged {
   my ($self) = @_;
   return !!$self->{attrs}{page};
 }
@@ -3563,8 +3572,8 @@ Adds to the WHERE clause.
   # only return rows WHERE deleted IS NULL for all searches
   __PACKAGE__->resultset_attributes({ where => { deleted => undef } }); )
 
-Can be overridden by passing C<{ where => undef }> as an attribute
-to a resulset.
+Can be overridden by passing C<< { where => undef } >> as an attribute
+to a resultset.
 
 =back