conflict resolution and asset recompilation

6 files changed, 28 insertions, 58 deletions

diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb
index cb4bf65b4..bdf9e0b4b 100644
--- a/config/initializers/active_record.rb
+++ b/config/initializers/active_record.rb
@@ -1,2 +1,5 @@
+require_relative '../../lib/af83/stored_procedures'
+
 ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key"
 
+StoredProcedures.create_stored_procedure(:clone_schema)
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 602c4b51d..2c2632f40 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -41,7 +41,9 @@ Apartment.configure do |config|
     "CleanUpResult",
     "Calendar",
     "Import",
-    "NetexImport"
+    "NetexImport",
+    "ImportMessage",
+    "ImportResource"
   ]
 
   # use postgres schemas?
diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb
index 2cdc37243..e2341f037 100644
--- a/config/initializers/formtastic.rb
+++ b/config/initializers/formtastic.rb
@@ -74,3 +74,9 @@ Formtastic::FormBuilder.default_text_area_width = 50
 # this to false. Doing so will add a `novalidate` attribute to the `<form>` tag.
 # See http://diveintohtml5.org/forms.html#validation for more info.
 # Formtastic::FormBuilder.perform_browser_validations = true
+
+
+# ------------------------------------------------------------------------------------
+# Preparing Formtastic 4.0
+Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
+Formtastic::FormBuilder.input_class_finder  = Formtastic::InputClassFinder
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
diff --git a/config/initializers/ransack.rb b/config/initializers/ransack.rb
new file mode 100644
index 000000000..659ee4a79
--- /dev/null
+++ b/config/initializers/ransack.rb
@@ -0,0 +1,13 @@
+Ransack.configure do |config|
+  config.add_predicate 'between',
+                       arel_predicate: 'between',
+                       formatter: proc { |v| v.split(' to ') },
+                       type: :string
+end
+module Arel
+  module Predications
+    def between other
+      gteq(other[0]).and(lt(other[1]))
+    end
+  end
+end
diff --git a/config/initializers/squeel.rb b/config/initializers/squeel.rb
index 821e72952..9fb8b24b2 100644
--- a/config/initializers/squeel.rb
+++ b/config/initializers/squeel.rb
@@ -1,8 +1,8 @@
-Squeel.configure do |config|
+# Squeel.configure do |config|
   # To load hash extensions (to allow for AND (&), OR (|), and NOT (-) against
   # hashes of conditions):
   #
-  config.load_core_extensions :hash
+  # config.load_core_extensions :hash
 
   # To load symbol extensions (for a subset of the old MetaWhere functionality,
   # via Arel predicate methods on Symbols: :name.matches, etc):
@@ -21,4 +21,4 @@ Squeel.configure do |config|
   # "less_than_any" and "less_than_all" as well:
   #
   # config.alias_predicate :less_than, :lt
-end
+# end