Ticket #9694: sti_conds_skip_abstract_classes.diff

base.rb

@@ -1197 +1197 @@
-
-        def type_condition
-          quoted_inheritance_column = connection.quote_column_name(inheritance_column)
-"#{table_name}.#{quoted_inheritance_column} = '#{name.demodulize}' "
-condition << "OR #{table_name}.#{quoted_inheritance_column} = '#{subclass.name.demodulize}' 
+abstract_class? ? [] : ["#{table_name}.#{quoted_inheritance_column} = '#{name.demodulize}' "]
+subclass.abstract_class? ? condition : condition << "#{table_name}.#{quoted_inheritance_column} = '#{subclass.name.demodulize}'
-          end
-
-" (#{type_condition
+type_condition.empty? ? nil : " (#{type_condition.join(' OR ')
-        end
-
-        # Guesses the table name, but does not decorate it with prefix and suffix information.