WIP

Author: aidanharan

lib/arel/visitors/sqlserver.rb

@@ -310,33 +310,36 @@ def make_Fetch_Possible_And_Deterministic(o)
         return if o.limit.nil? && o.offset.nil?
         return if o.orders.any?
 
-
-
-        if (any_groupings?(o) || xxx_has_join_sources?(o)) && (projection = projection_to_order_by_for_fetch(o))
-          o.orders = [projection.asc]
-        else
-          pk = primary_Key_From_Table(table_From_Statement(o))
-          o.orders = [pk.asc] if pk
+        if any_groupings?(o) || has_non_table_join_sources?(o)
+          if projection = projection_to_order_by_for_fetch(o)
+            o.orders = [projection.asc]
+            return
+          end
         end
+
+        pk = primary_Key_From_Table(table_From_Statement(o))
+        o.orders = [pk.asc] if pk
       end
 
       def any_groupings?(o)
         o.cores.any? { |core| core.groups.present? }
       end
 
+      def has_non_table_join_sources?(o)
+        o.cores.none? { |core| core.source.left.is_a?(Arel::Table) }
+      end
+
       # TODO: Need this for "in the subquery the first projection is used for ordering if none provided" test.
       # TODO: rename
-      def xxx_has_join_sources?(o)
-        # binding.pry if $DEBUG
-
-
-        return false unless o.is_a?(Arel::Nodes::SelectStatement)
-
-        # false
-        o.cores.any? { |core| core.source.is_a?(Arel::Nodes::JoinSource) }
-      # rescue => e
-      #   binding.pry
-      end
+      # def xxx_has_join_sources?(o)
+      #   # binding.pry if $DEBUG
+      #
+      #   return true
+      #
+      #   # return false unless o.is_a?(Arel::Nodes::SelectStatement)
+      #   #
+      #   # o.cores.any? { |core| core.source.is_a?(Arel::Nodes::JoinSource) }
+      # end
 
       # Find the first projection or part of projection that can be used for ordering. Cannot use
       # projections with '*' or '1 AS one' in them.