lib/ajax-datatables-rails/datatable/column.rb in ajax-datatables-rails-1.3.1 vs lib/ajax-datatables-rails/datatable/column.rb in ajax-datatables-rails-1.4.0

@@ -34,15 +34,15 @@
       def table
         model.respond_to?(:arel_table) ? model.arel_table : model
       end
 
       def model
-        @model ||= source.split('.').first.constantize
+        @model ||= custom_field? ? source : source.split('.').first.constantize
       end
 
       def field
-        @field ||= source.split('.').last.to_sym
+        @field ||= custom_field? ? source : source.split('.').last.to_sym
       end
 
       def custom_field?
         !source.include?('.')
       end
@@ -64,16 +64,17 @@
       TYPE_CAST_SQLITE    = 'TEXT'
       TYPE_CAST_ORACLE    = 'VARCHAR2(4000)'
       TYPE_CAST_SQLSERVER = 'VARCHAR(4000)'
 
       DB_ADAPTER_TYPE_CAST = {
-        mysql:          TYPE_CAST_MYSQL,
-        mysql2:         TYPE_CAST_MYSQL,
-        sqlite:         TYPE_CAST_SQLITE,
-        sqlite3:        TYPE_CAST_SQLITE,
-        oracle:         TYPE_CAST_ORACLE,
-        oracleenhanced: TYPE_CAST_ORACLE,
-        sqlserver:      TYPE_CAST_SQLSERVER,
+        mysql:           TYPE_CAST_MYSQL,
+        mysql2:          TYPE_CAST_MYSQL,
+        sqlite:          TYPE_CAST_SQLITE,
+        sqlite3:         TYPE_CAST_SQLITE,
+        oracle:          TYPE_CAST_ORACLE,
+        oracleenhanced:  TYPE_CAST_ORACLE,
+        oracle_enhanced: TYPE_CAST_ORACLE,
+        sqlserver:       TYPE_CAST_SQLSERVER,
       }.freeze
 
       private_constant :TYPE_CAST_DEFAULT
       private_constant :TYPE_CAST_MYSQL
       private_constant :TYPE_CAST_SQLITE