lib/magic_grid/definition.rb in magic_grid-0.11.0 vs lib/magic_grid/definition.rb in magic_grid-0.11.1

@@ -4,10 +4,14 @@
 module MagicGrid
   class Definition
     attr_reader :columns, :magic_id, :options, :params,
       :current_sort_col, :current_order, :default_order, :per_page
 
+    def magic_collection
+      @collection
+    end
+
     def collection
       @collection.collection
     end
 
     DEFAULTS = {
@@ -62,13 +66,14 @@
       @per_page = @options[:per_page]
       @collection = Collection[collection, self]
       begin
         #if @collection.respond_to? :table
         table_name = @collection.quoted_table_name
-        table_columns = @collection.table.columns.map {|c| c.name}
+        table_columns = @collection.column_names
       rescue
-        MagicGrid.logger.debug "Given collection doesn't respond to :table well"
+        msg = "Given collection doesn't respond to :quoted_table_name or :table well: "
+        MagicGrid.logger.debug("#{msg} - #{$!}")
         table_name = nil
         table_columns = @columns.each_index.to_a
       end
       i = 0
       hash = []
@@ -79,10 +84,10 @@
           c = {:label => c}
         end
         c[:id] = i
         i += 1
         if c.key?(:col) and c[:col].is_a?(Symbol) and table_columns.include?(c[:col])
-          c[:sql] = "#{table_name}.#{@collection.connection.quote_column_name(c[:col].to_s)}" unless c.key?(:sql)
+          c[:sql] = "#{table_name}.#{@collection.quote_column_name(c[:col].to_s)}" unless c.key?(:sql)
         end
         c[:label] = c[:col].to_s.titleize if not c.key? :label
         hash << c[:label]
         c
       end