remove mention of name_sep from Schema::Loader doc

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

diff --git a/lib/DBIx/Class/SQLMaker/LimitDialects.pm b/lib/DBIx/Class/SQLMaker/LimitDialects.pm
index 846cab7..1c30436 100644 (file)
--- a/lib/DBIx/Class/SQLMaker/LimitDialects.pm
+++ b/lib/DBIx/Class/SQLMaker/LimitDialects.pm
@@ -202,7 +202,6 @@ SELECT $out_sel FROM (
 
 EOS
 
-  $sql =~ s/\s*\n\s*/ /g;   # easier to read in the debugger
   return $sql;
 }
 
@@ -307,7 +306,6 @@ EOS
 EOS
   }
 
-  $sql =~ s/\s*\n\s*/ /g;   # easier to read in the debugger
   return $sql;
 }
 
@@ -349,7 +347,7 @@ sub _Top {
     ? $requested_order
     : [ map
       { "$rs_attrs->{alias}.$_" }
-      ( $rs_attrs->{_rsroot_source_handle}->resolve->_pri_cols )
+      ( $rs_attrs->{_rsroot_rsrc}->_pri_cols )
     ]
   );
 
@@ -390,9 +388,9 @@ sub _Top {
 
     # since whatever order bindvals there are, they will be realiased
     # and need to show up in front of the entire initial inner subquery
-    # Unshift *from_bind* to make this happen (horrible, horrible, but
-    # we don't have another mechanism yet)
-    unshift @{$self->{from_bind}}, @{$self->{order_bind}};
+    # *unshift* the selector bind stack to make this happen (horrible,
+    # horrible, but we don't have another mechanism yet)
+    unshift @{$self->{select_bind}}, @{$self->{order_bind}};
   }
 
   # and this is order re-alias magic
@@ -433,7 +431,6 @@ sub _Top {
     $order_by_requested,
   ) if ( ($offset && $order_by_requested) || ($mid_sel ne $out_sel) );
 
-  $sql =~ s/\s*\n\s*/ /g;   # easier to read in the debugger
   return $sql;
 }
 
@@ -484,7 +481,7 @@ Currently used by B<Sybase ASE>, due to lack of any other option.
 sub _GenericSubQ {
   my ($self, $sql, $rs_attrs, $rows, $offset) = @_;
 
-  my $root_rsrc = $rs_attrs->{_rsroot_source_handle}->resolve;
+  my $root_rsrc = $rs_attrs->{_rsroot_rsrc};
   my $root_tbl_name = $root_rsrc->name;
 
   # mangle the input sql as we will be replacing the selector
@@ -579,7 +576,6 @@ EOS
     ,
   );
 
-  $sql =~ s/\s*\n\s*/ /g;   # easier to read in the debugger
   return $sql;
 }