conflict resolution and asset recompilation

1 files changed, 0 insertions, 54 deletions

diff --git a/config/initializers/postgresql_adapter_patch.rb b/config/initializers/postgresql_adapter_patch.rb
deleted file mode 100644
index 2e4d73f85..000000000
--- a/config/initializers/postgresql_adapter_patch.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# module ::ArJdbc
-#   module PostgreSQL
-#     def quote_column_name(name)
-#       if name.is_a?(Array)
-#         name.collect { |n| %("#{n.to_s.gsub("\"", "\"\"")}") }.join(',')
-#       else
-#         %("#{name.to_s.gsub("\"", "\"\"")}")
-#       end
-#     end
-#   end
-# end
-# ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key"
-
-# Add missing double-quote to write array of daterange in SQL query
-# See #1782
-
-class ActiveRecord::ConnectionAdapters::PostgreSQLColumn
-
-  def self.array_to_string(value, column, adapter)
-    casted_values = value.map do |val|
-      if String === val
-        if val == "NULL"
-          "\"#{val}\""
-        else
-          quote_and_escape(adapter.type_cast(val, column, true))
-        end
-      elsif Range === val
-        casted_value = adapter.type_cast(val, column, true)
-        "\"#{casted_value}\""
-      else
-        adapter.type_cast(val, column, true)
-      end
-    end
-    "{#{casted_values.join(',')}}"
-  end
-
-end
-
-module ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID
-  class DateRange < Range
-    # Unnormalize daterange
-    # [2016-11-19,2016-12-26) -> 2016-11-19..2016-12-25
-    def type_cast(value)
-      result = super value
-
-      if result.respond_to?(:exclude_end?) && result.exclude_end?
-        ::Range.new(result.begin, result.end - 1, false)
-      else
-        result
-      end
-    end
-  end
-  register_type 'daterange', DateRange.new(:date)
-end