236c236,237
<           o, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
---
>           o, oc, tc, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
>  
241c242
<           sql << " GROUP BY #{o}.#{o_pk}"
---
>           sql << " GROUP BY #{oc}"
245c246
<           
---
>  
247c248
<         end
---
> 	end
267c268
<           o, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
---
> 	  o, oc, tc, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
271c272
<           sql << " GROUP BY #{t}.name"
---
>           sql << " GROUP BY #{tc}"
296c297
<           o, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
---
>           o, oc, tc, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
321c322
<           o, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
---
>           o, oc, tc, o_pk, o_fk, t, t_pk, t_fk, jt = set_locals_for_sql
347,349c348,353
<           [ table_name, primary_key, taggable_foreign_key,
<             tag_model.table_name, tag_model.primary_key, tag_foreign_key,
<             tags_join_model ? tags_join_model.table_name : tags_join_table ]
---
>           model_columns_for_sql = self.column_names.collect {|c| c = "#{table_name}.#{c}"}.join(',')
>           tag_model_columns_for_sql = tag_model.column_names.collect {|c| c = "#{tag_model.table_name}.#{c}"}.join(',')
>  
>           [ table_name, model_columns_for_sql, tag_model_columns_for_sql, primary_key,
>             taggable_foreign_key, tag_model.table_name, tag_model.primary_key,
>             tag_foreign_key, tags_join_model ? tags_join_model.table_name : tags_join_table ]