Ticket #8937: habtm_with_joins_fix_with_name_checking.diff

activerecord/lib/active_record/base.rb

@@ -1170 +1170 @@
-        # The optional scope argument is for the current :find scope.
-        def add_joins!(sql, options, scope = :auto)
-          scope = scope(:find) if :auto == scope
-
+
+
+
+
+
+
-          sql << " #{join} " if join
-        end
-
@@ -1202 +1207 @@
-          table_name
-        end
-
+        # Returns the table names/aliases used in a JOIN SQL fragment. For each table used,
+        # this method returns its alias if it is given one using AS, and its real name otherwise.
+        def table_aliases_from_join_statement(str)
+          return [] if str.blank?
+          return str.scan(/JOIN\s+(`[^`]`|\S+)(?:\s+AS\s+(`[^`]`|\S+))?/i).collect do |name|
+            (name[1] || name[0]).gsub(/^`(.*)`$/, '\1')
+          end
+        end
+
-        # Enables dynamic finders like find_by_user_name(user_name) and find_by_user_name_and_password(user_name, password) that are turned into
-        # find(:first, :conditions => ["user_name = ?", user_name]) and  find(:first, :conditions => ["user_name = ? AND password = ?", user_name, password])
-        # respectively. Also works for find(:all), but using find_all_by_amount(50) that are turned into find(:all, :conditions => ["amount = ?", 50]).