duty_free 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4451cbb29d90fb32347b1ff91e91a249da97769e7a64f2524efa912b8971bf86
-  data.tar.gz: ee3b06059aa89be48329ef48605287e8cb1725dd9f61460d9b3d044354405540
+  metadata.gz: 714b772aa09eb15409cd7c58d4ccb64f967caf41f2a13e7813e90cc94d7eb48f
+  data.tar.gz: 750dfe36b729979a0356f14f8588568822ae22911c142d294358231504daa78e
 SHA512:
-  metadata.gz: 953bb38945daf16d0f22daa921ad1e0f46881583d51145a59b1983869da8d79c0675640677f1774dbdb9321695aeb69dc29dd4f66250704be0199fed33ab84b6
-  data.tar.gz: 8e3a0c166acb9bc22919218764e1e39ffa9d495e22ea93eaeb8ef6810b545a99f6af08bf594cc3958e7d9169ccfe5a7841c08b2799e4981066cb47968daaf26b
+  metadata.gz: 9d77a228b4e4990dad39882a4e67d1009f3c16114bc0e9b24280e1f8e9437c7fc55a8884eb37e8f6c15898958833c7f79bb7984d721f4dbd1fce7311ca6421d0
+  data.tar.gz: 1d35f3197ab500a6210eecc561190c02a04d87e3d4b2634a9a62695488d4e2ed0825f7240836aa9d32fe8ce01e06be38ddccda1955ca3d3669fd7ad18e8335f2

data/lib/duty_free.rb

@@ -1,5 +1,69 @@
 # frozen_string_literal: true
 
+require 'active_record/version'
+
+# ActiveRecord before 4.0 didn't have #version
+unless ActiveRecord.respond_to?(:version)
+  module ActiveRecord
+    def self.version
+      ::Gem::Version.new(ActiveRecord::VERSION::STRING)
+    end
+  end
+end
+
+# In ActiveSupport older than 5.0, the duplicable? test tries to new up a BigDecimal,
+# and Ruby 2.6 and later deprecates #new.  This removes the warning from BigDecimal.
+require 'bigdecimal'
+if ActiveRecord.version < ::Gem::Version.new('5.0') &&
+   ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6')
+  def BigDecimal.new(*args, **kwargs)
+    BigDecimal(*args, **kwargs)
+  end
+end
+
+# Allow ActiveRecord 4.0 and 4.1 to work with newer Ruby (>= 2.4) by avoiding a "stack level too deep"
+# error when ActiveSupport tries to smarten up Numeric by messing with Fixnum and Bignum at the end of:
+# activesupport-4.0.13/lib/active_support/core_ext/numeric/conversions.rb
+if ActiveRecord.version < ::Gem::Version.new('4.2') &&
+   ActiveRecord.version > ::Gem::Version.new('3.2') &&
+   Object.const_defined?('Integer') && Integer.superclass.name == 'Numeric'
+  class OurFixnum < Integer; end
+  Numeric.const_set('Fixnum', OurFixnum)
+  class OurBignum < Integer; end
+  Numeric.const_set('Bignum', OurBignum)
+end
+
+# Allow ActiveRecord < 3.2 to run with newer versions of Psych gem
+if BigDecimal.respond_to?(:yaml_tag) && !BigDecimal.respond_to?(:yaml_as)
+  class BigDecimal
+    class <<self
+      alias yaml_as yaml_tag
+    end
+  end
+end
+
+require 'duty_free/util'
+
+# Allow ActiveRecord < 3.2 to work with Ruby 2.7 and later
+if ActiveRecord.version < ::Gem::Version.new('3.2') &&
+   ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.7')
+  # Remove circular reference for "now"
+  ::DutyFree::Util._patch_require(
+    'active_support/values/time_zone.rb', '/activesupport',
+    '  def parse(str, now=now)',
+    '  def parse(str, now=now())'
+  )
+  # Remove circular reference for "reflection" for ActiveRecord 3.1
+  if ActiveRecord.version >= ::Gem::Version.new('3.1')
+    ::DutyFree::Util._patch_require(
+      'active_record/associations/has_many_association.rb', '/activerecord',
+      'reflection = reflection)',
+      'reflection = reflection())',
+      :HasManyAssociation # Make sure the path for this guy is available to be autoloaded
+    )
+  end
+end
+
 require 'active_record'
 
 require 'duty_free/config'
@@ -62,25 +126,301 @@ module DutyFree
   end
 end
 
+# Major compatibility fixes for ActiveRecord < 4.2
+# ================================================
 ActiveSupport.on_load(:active_record) do
+  # Rails < 4.0 cannot do #find_by, #find_or_create_by, or do #pluck on multiple columns, so here are the patches:
+  if ActiveRecord.version < ::Gem::Version.new('4.0')
+    module ActiveRecord
+      # Normally find_by is in FinderMethods, which older AR doesn't have
+      module Calculations
+        def find_by(*args)
+          where(*args).limit(1).to_a.first
+        end
+
+        def find_or_create_by(attributes, &block)
+          find_by(attributes) || create(attributes, &block)
+        end
+
+        def pluck(*column_names)
+          column_names.map! do |column_name|
+            if column_name.is_a?(Symbol) && self.column_names.include?(column_name.to_s)
+              "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column_name)}"
+            else
+              column_name
+            end
+          end
+
+          # Same as:  if has_include?(column_names.first)
+          if eager_loading? || (includes_values.present? && (column_names.first || references_eager_loaded_tables?))
+            construct_relation_for_association_calculations.pluck(*column_names)
+          else
+            relation = clone # spawn
+            relation.select_values = column_names
+            result = if klass.connection.class.name.end_with?('::PostgreSQLAdapter')
+                       rslt = klass.connection.execute(relation.arel.to_sql)
+                       rslt.type_map =
+                         @type_map ||= proc do
+                           # This aliasing avoids the warning:
+                           # "no type cast defined for type "numeric" with oid 1700. Please cast this type
+                           # explicitly to TEXT to be safe for future changes."
+                           PG::BasicTypeRegistry.alias_type(0, 'numeric', 'text') # oid 1700
+                           PG::BasicTypeRegistry.alias_type(0, 'time', 'text') # oid 1083
+                           PG::BasicTypeMapForResults.new(klass.connection.raw_connection)
+                         end.call
+                       rslt.to_a
+                     elsif respond_to?(:bind_values)
+                       klass.connection.select_all(relation.arel, nil, bind_values)
+                     else
+                       klass.connection.select_all(relation.arel.to_sql, nil)
+                     end
+            if result.empty?
+              []
+            else
+              columns = result.first.keys.map do |key|
+                # rubocop:disable Style/SingleLineMethods Naming/MethodParameterName
+                klass.columns_hash.fetch(key) do
+                  Class.new { def type_cast(v); v; end }.new
+                end
+                # rubocop:enable Style/SingleLineMethods Naming/MethodParameterName
+              end
+
+              result = result.map do |attributes|
+                values = klass.initialize_attributes(attributes).values
+
+                columns.zip(values).map do |column, value|
+                  column.type_cast(value)
+                end
+              end
+              columns.one? ? result.map!(&:first) : result
+            end
+          end
+        end
+      end
+
+      unless Base.is_a?(Calculations)
+        class Base
+          class << self
+            delegate :pluck, :find_by, :find_or_create_by, to: :scoped
+          end
+        end
+      end
+
+      # ActiveRecord < 3.2 doesn't have initialize_attributes, used by .pluck()
+      unless AttributeMethods.const_defined?('Serialization')
+        class Base
+          class << self
+            def initialize_attributes(attributes, options = {}) #:nodoc:
+              serialized = (options.delete(:serialized) { true }) ? :serialized : :unserialized
+              # super(attributes, options)
+
+              serialized_attributes.each do |key, coder|
+                attributes[key] = Attribute.new(coder, attributes[key], serialized) if attributes.key?(key)
+              end
+
+              attributes
+            end
+          end
+        end
+      end
+
+      # This only gets added for ActiveRecord < 3.2
+      module Reflection
+        unless AssociationReflection.instance_methods.include?(:foreign_key)
+          class AssociationReflection < MacroReflection
+            alias foreign_key association_foreign_key
+          end
+        end
+      end
+
+      # ActiveRecord 3.1 and 3.2 didn't try to bring in &block for the .extending() convenience thing
+      # that smartens up scopes, and Ruby 2.7 complained loudly about just doing the magical "Proc.new"
+      # that historically would just capture the incoming block.
+      module QueryMethods
+        unless instance_method(:extending).parameters.include?([:block, :block])
+          # These first two lines used to be:
+          # def extending(*modules)
+          #   modules << Module.new(&Proc.new) if block_given?
+
+          def extending(*modules, &block)
+            modules << Module.new(&block) if block_given?
+
+            return self if modules.empty?
+
+            relation = clone
+            relation.send(:apply_modules, modules.flatten)
+            relation
+          end
+        end
+      end
+
+      # Same kind of thing for ActiveRecord::Scoping::Default#default_scope
+      module Scoping
+        module Default
+          module ClassMethods
+            if instance_methods.include?(:default_scope) &&
+               !instance_method(:default_scope).parameters.include?([:block, :block])
+              # Fix for AR 3.2-5.1
+              def default_scope(scope = nil, &block)
+                scope = block if block_given?
+
+                if scope.is_a?(Relation) || !scope.respond_to?(:call)
+                  raise ArgumentError,
+                        'Support for calling #default_scope without a block is removed. For example instead ' \
+                        "of `default_scope where(color: 'red')`, please use " \
+                        "`default_scope { where(color: 'red') }`. (Alternatively you can just redefine " \
+                        'self.default_scope.)'
+                end
+
+                self.default_scopes += [scope]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  # Rails < 4.2 is not innately compatible with Ruby 2.4 and later, and comes up with:
+  # "TypeError: Cannot visit Integer" unless we patch like this:
+  if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.4') &&
+     Arel::Visitors.const_defined?('DepthFirst') &&
+     !Arel::Visitors::DepthFirst.private_instance_methods.include?(:visit_Integer)
+    module Arel
+      module Visitors
+        class DepthFirst < Visitor
+          alias visit_Integer terminal
+        end
+
+        class Dot < Visitor
+          alias visit_Integer visit_String
+        end
+
+        class ToSql < Visitor
+        private
+
+          # ActiveRecord before v3.2 uses Arel < 3.x, which does not have Arel#literal.
+          unless private_instance_methods.include?(:literal)
+            def literal(obj)
+              obj
+            end
+          end
+          alias visit_Integer literal
+        end
+      end
+    end
+  end
+
+  unless DateTime.instance_methods.include?(:nsec)
+    class DateTime < Date
+      def nsec
+        (sec_fraction * 1_000_000_000).to_i
+      end
+    end
+  end
+
+  # First part of arel_table_type stuff:
+  # ------------------------------------
+  # (more found below)
+  if ActiveRecord.version < ::Gem::Version.new('5.0')
+    # Used by Util#_arel_table_type
+    module ActiveRecord
+      class Base
+        def self.arel_table
+          @arel_table ||= Arel::Table.new(table_name, arel_engine).tap do |x|
+            x.instance_variable_set(:@_arel_table_type, self)
+          end
+        end
+      end
+    end
+  end
+
   include ::DutyFree::Extensions
 end
 
-# # Require frameworks
-# if defined?(::Rails)
-#   # Rails module is sometimes defined by gems like rails-html-sanitizer
-#   # so we check for presence of Rails.application.
-#   if defined?(::Rails.application)
-#     require "duty_free/frameworks/rails"
-#   else
-#     ::Kernel.warn(<<-EOS.freeze
-# DutyFree has been loaded too early, before rails is loaded. This can
-# happen when another gem defines the ::Rails namespace, then DF is loaded,
-# all before rails is loaded. You may want to reorder your Gemfile, or defer
-# the loading of DF by using `require: false` and a manual require elsewhere.
-# EOS
-# )
-#   end
-# else
-#   require "duty_free/frameworks/active_record"
-# end
+# Do this earlier because stuff here gets mixed into JoinDependency::JoinAssociation and AssociationScope
+if ActiveRecord.version < ::Gem::Version.new('5.0') && Object.const_defined?('PG::Connection')
+  # Avoid pg gem deprecation warning:  "You should use PG::Connection, PG::Result, and PG::Error instead"
+  PGconn = PG::Connection
+  PGresult = PG::Result
+  PGError = PG::Error
+end
+
+# More arel_table_type stuff:
+# ---------------------------
+if ActiveRecord.version < ::Gem::Version.new('5.2')
+  # Specifically for AR 3.1 and 3.2 to avoid:  "undefined method `delegate' for ActiveRecord::Reflection::ThroughReflection:Class"
+  require 'active_support/core_ext/module/delegation' if ActiveRecord.version < ::Gem::Version.new('4.0')
+  # Used by Util#_arel_table_type
+  # rubocop:disable Style/CommentedKeyword
+  module ActiveRecord
+    module Reflection
+      # AR < 4.0 doesn't know about join_table and derive_join_table
+      unless AssociationReflection.instance_methods.include?(:join_table)
+        class AssociationReflection < MacroReflection
+          def join_table
+            @join_table ||= options[:join_table] || derive_join_table
+          end
+
+        private
+
+          def derive_join_table
+            [active_record.table_name, klass.table_name].sort.join("\0").gsub(/^(.*[._])(.+)\0\1(.+)/, '\1\2_\3').gsub("\0", '_')
+          end
+        end
+      end
+    end
+
+    module Associations
+      # Specific to AR 4.2 - 5.1:
+      if Associations.const_defined?('JoinDependency') && JoinDependency.private_instance_methods.include?(:table_aliases_for)
+        class JoinDependency
+        private
+
+          if ActiveRecord.version < ::Gem::Version.new('5.1') # 4.2 or 5.0
+            def table_aliases_for(parent, node)
+              node.reflection.chain.map do |reflection|
+                alias_tracker.aliased_table_for(
+                  reflection.table_name,
+                  table_alias_for(reflection, parent, reflection != node.reflection)
+                ).tap do |x|
+                  # %%% Specific only to Rails 4.2 (and maybe 4.1?)
+                  x = x.left if x.is_a?(Arel::Nodes::TableAlias)
+                  y = reflection.chain.find { |c| c.table_name == x.name }
+                  x.instance_variable_set(:@_arel_table_type, y.klass)
+                end
+              end
+            end
+          end
+        end
+      elsif Associations.const_defined?('JoinHelper') && JoinHelper.private_instance_methods.include?(:construct_tables)
+        module JoinHelper
+        private
+
+          # AR > 3.0 and < 4.2 (%%% maybe only < 4.1?) uses construct_tables like this:
+          def construct_tables
+            tables = []
+            chain.each do |reflection|
+              tables << alias_tracker.aliased_table_for(
+                table_name_for(reflection),
+                table_alias_for(reflection, reflection != self.reflection)
+              ).tap do |x|
+                x = x.left if x.is_a?(Arel::Nodes::TableAlias)
+                x.instance_variable_set(:@_arel_table_type, reflection.chain.find { |c| c.table_name == x.name }.klass)
+              end
+
+              next unless reflection.source_macro == :has_and_belongs_to_many
+
+              tables << alias_tracker.aliased_table_for(
+                (reflection.source_reflection || reflection).join_table,
+                table_alias_for(reflection, true)
+              )
+            end
+            tables
+          end
+        end
+      end
+    end
+  end # module ActiveRecord
+  # rubocop:enable Style/CommentedKeyword
+end

data/lib/duty_free/column.rb

@@ -36,20 +36,16 @@ module DutyFree
     end
 
     def titleize
-      @titleized ||= sym_string.titleize
+      @titleize ||= to_sym.titleize
     end
 
-    delegate :to_sym, to: :sym_string
-
     def path
       @path ||= ::DutyFree::Util._prefix_join([pre_prefix, prefix]).split('.').map(&:to_sym)
     end
 
-  private
-
     # The snake-cased column name to be used for building the full list of template_columns
-    def sym_string
-      @sym_string ||= ::DutyFree::Util._prefix_join(
+    def to_sym
+      @to_sym ||= ::DutyFree::Util._prefix_join(
         [pre_prefix, prefix, ::DutyFree::Util._clean_name(name, import_template_as)],
         '_'
       ).tr('.', '_')

data/lib/duty_free/extensions.rb

@@ -6,7 +6,10 @@ require 'duty_free/suggest_template'
 
 # :nodoc:
 module DutyFree
+  # rubocop:disable Style/CommentedKeyword
   module Extensions
+    MAX_ID = Arel.sql('MAX(id)')
+
     def self.included(base)
       base.send :extend, ClassMethods
       base.send :extend, ::DutyFree::SuggestTemplate::ClassMethods
@@ -14,12 +17,9 @@ module DutyFree
 
     # :nodoc:
     module ClassMethods
-      MAX_ID = Arel.sql('MAX(id)')
-      # def self.extended(model)
-      # end
-
       # Export at least column header, and optionally include all existing data as well
-      def df_export(is_with_data = true, import_template = nil)
+      def df_export(is_with_data = true, import_template = nil, use_inner_joins = false)
+        use_inner_joins = true unless respond_to?(:left_joins)
         # In case they are only supplying the columns hash
         if is_with_data.is_a?(Hash) && !import_template
           import_template = is_with_data
@@ -50,17 +50,51 @@ module DutyFree
         rows = [rows]
 
         if is_with_data
+          order_by = []
+          order_by << ['_', primary_key] if primary_key
+          all = import_template[:all] || import_template[:all!]
           # Automatically create a JOINs strategy and select list to get back all related rows
-          template_cols, template_joins = ::DutyFree::Extensions._recurse_def(self, import_template[:all], import_template)
-          relation = left_joins(template_joins)
+          template_cols, template_joins = ::DutyFree::Extensions._recurse_def(self, all, import_template, nil, order_by)
+          # We do this so early here because it removes type objects from template_joins so then
+          # template_joins can immediately be used for inner and outer JOINs.
+          our_names = [[self, '_']] + ::DutyFree::Util._recurse_arel(template_joins)
+          relation = use_inner_joins ? joins(template_joins) : left_joins(template_joins)
 
           # So we can properly create the SELECT list, create a mapping between our
           # column alias prefixes and the aliases AREL creates.
-          arel_alias_names = ::DutyFree::Util._recurse_arel(relation.arel.ast.cores.first.source)
-          our_names = ::DutyFree::Util._recurse_arel(template_joins)
-          mapping = our_names.zip(arel_alias_names).to_h
+          # %%% If with Rails 3.1 and older you get "NoMethodError: undefined method `eq' for nil:NilClass"
+          # when trying to call relation.arel, then somewhere along the line while navigating a has_many
+          # relationship it can't find the proper foreign key.
+          core = relation.arel.ast.cores.first
+          # Accommodate AR < 3.2
+          arel_alias_names = if core.froms.is_a?(Arel::Table)
+                               # All recent versions of AR have #source which brings up an Arel::Nodes::JoinSource
+                               ::DutyFree::Util._recurse_arel(core.source)
+                             else
+                               # With AR < 3.2, "froms" brings up the top node, an Arel::Nodes::InnerJoin
+                               ::DutyFree::Util._recurse_arel(core.froms)
+                             end
+          # Make sure our_names lines up with the arel_alias_name by comparing the ActiveRecord type.
+          # AR < 5.0 behaves differently than newer versions, and AR 5.0 and 5.1 have a bug in the
+          # way the types get determined, so if we want perfect results then we must compensate for
+          # these foibles.  Thank goodness that AR 5.2 and later find the proper type and make it
+          # available through the type_caster object, which is what we use when building the list of
+          # arel_alias_names.
+          mapping = arel_alias_names.each_with_object({}) do |arel_alias_name, s|
+            if our_names.first&.first == arel_alias_name.first
+              s[our_names.first.last] = arel_alias_name.last
+              our_names.shift
+            end
+            s
+          end
+          relation = (order_by.empty? ? relation : relation.order(order_by.map { |o| "#{mapping[o.first]}.#{o.last}" }))
+          # puts mapping.inspect
+          # puts relation.dup.select(template_cols.map { |x| x.to_s(mapping) }).to_sql
+
+          # Allow customisation of query before running it
+          relation = yield(relation, mapping) if block_given?
 
-          relation.select(template_cols.map { |x| x.to_s(mapping) }).each do |result|
+          relation&.select(template_cols.map { |x| x.to_s(mapping) })&.each do |result|
             rows << ::DutyFree::Extensions._template_columns(self, import_template).map do |col|
               value = result.send(col)
               case value
@@ -77,372 +111,88 @@ module DutyFree
         rows
       end
 
-      # With an array of incoming data, the first row having column names, perform the import
       def df_import(data, import_template = nil)
-        self.instance_variable_set(:@defined_uniques, nil)
-        self.instance_variable_set(:@valid_uniques, nil)
-
-        import_template ||= if constants.include?(:IMPORT_TEMPLATE)
-                              self::IMPORT_TEMPLATE
-                            else
-                              suggest_template(0, false, false)
-                            end
-        # puts "Chose #{import_template}"
-        inserts = []
-        updates = []
-        counts = Hash.new { |h, k| h[k] = [] }
-        errors = []
-
-        is_first = true
-        uniques = nil
-        cols = nil
-        starred = []
-        partials = []
-        all = import_template[:all]
-        keepers = {}
-        valid_unique = nil
-        existing = {}
-        devise_class = ''
-        ret = nil
-
-        reference_models = if Object.const_defined?('Apartment')
-                             Apartment.excluded_models
-                           else
-                             []
-                           end
-
-        if Object.const_defined?('Devise')
-          Object.const_get('Devise') # If this fails, devise_class will remain a blank string.
-          devise_class = Devise.mappings.values.first.class_name
-          reference_models -= [devise_class]
-        else
-          devise_class = ''
-        end
-
-        # Did they give us a filename?
-        if data.is_a?(String)
-          data = if data.length <= 4096 && data.split('\n').length == 1
-                   File.open(data)
-                 else
-                   # Hope that other multi-line strings might be CSV data
-                   CSV.new(data)
-                 end
-        end
-        # Or perhaps us a file?
-        if data.is_a?(File)
-          # Use the "roo" gem if it's available
-          data = if Object.const_defined?('Roo::Spreadsheet', { csv_options: { encoding: 'bom|utf-8' } })
-                   Roo::Spreadsheet.open(data)
-                 else
-                   # Otherwise generic CSV parsing
-                   require 'csv' unless Object.const_defined?('CSV')
-                   CSV.open(data)
-                 end
-        end
-
-        # Will show as just one transaction when using auditing solutions such as PaperTrail
-        ActiveRecord::Base.transaction do
-          # Check to see if they want to do anything before the whole import
-          if before_import ||= (import_template[:before_import]) # || some generic before_import)
-            before_import.call(data)
-          end
-          col_list = nil
-          data.each_with_index do |row, row_num|
-            row_errors = {}
-            if is_first # Anticipate that first row has column names
-              uniques = import_template[:uniques]
-
-              # Look for UTF-8 BOM in very first cell
-              row[0] = row[0][3..-1] if row[0].start_with?([239, 187, 191].pack('U*'))
-              # How about a first character of FEFF or FFFE to support UTF-16 BOMs?
-              #   FE FF big-endian (standard)
-              #   FF FE little-endian
-              row[0] = row[0][1..-1] if [65_279, 65_534].include?(row[0][0].ord)
-              cols = row.map { |col| (col || '').strip }
-
-              # Unique column combinations can be called out explicitly in models using uniques: {...}, or to just
-              # define one column at a time simply mark with an asterisk.
-              # Track and clean up stars
-              starred = cols.select do |col|
-                if col[0] == '*'
-                  col.slice!(0)
-                  col.strip!
-                end
-              end
-              partials = cols.select do |col|
-                if col[0] == '~'
-                  col.slice!(0)
-                  col.strip!
-                end
-              end
-              # %%% Will the uniques saved into @defined_uniques here just get redefined later
-              # after the next line, the map! with clean to change out the alias names?  So we can't yet set
-              # col_list?
-              defined_uniques(uniques, cols, cols.join('|'), starred)
-              cols.map! { |col| ::DutyFree::Util._clean_name(col, import_template[:as]) } # %%%
-              # Make sure that at least half of them match what we know as being good column names
-              template_column_objects = ::DutyFree::Extensions._recurse_def(self, import_template[:all], import_template).first
-              cols.each_with_index do |col, idx|
-                # prefixes = col_detail.pre_prefix + (col_detail.prefix.blank? ? [] : [col_detail.prefix])
-                keepers[idx] = template_column_objects.find { |col_obj| col_obj.titleize == col }
-                # puts "Could not find a match for column #{idx + 1}, #{col}" if keepers[idx].nil?
-              end
-              if keepers.length < (cols.length / 2) - 1
-                raise ::DutyFree::LessThanHalfAreMatchingColumnsError, I18n.t('import.altered_import_template_coumns')
-              end
+        ::DutyFree::Extensions.import(self, data, import_template)
+      end
 
-              # Returns just the first valid unique lookup set if there are multiple
-              valid_unique = find_existing(uniques, cols, starred, import_template, keepers, false)
-              # Make a lookup from unique values to specific IDs
-              existing = pluck(*([:id] + valid_unique.keys)).each_with_object(existing) do |v, s|
-                s[v[1..-1].map(&:to_s)] = v.first
-                s
-              end
-              is_first = false
-            else # Normal row of data
-              is_insert = false
-              is_do_save = true
-              existing_unique = valid_unique.inject([]) do |s, v|
-                s << if v.last.is_a?(Array)
-                       v.last[0].where(v.last[1] => row[v.last[2]]).limit(1).pluck(MAX_ID).first.to_s
-                     else
-                       binding.pry if v.last.nil?
-                       row[v.last].to_s
-                     end
-              end
-              # Check to see if they want to preprocess anything
-              if @before_process ||= import_template[:before_process]
-                existing_unique = @before_process.call(valid_unique, existing_unique)
-              end
-              obj = if existing.include?(existing_unique)
-                      find(existing[existing_unique])
-                    else
-                      is_insert = true
-                      new
-                    end
-              sub_obj = nil
-              is_has_one = false
-              has_ones = []
-              polymorphics = []
-              sub_objects = {}
-              this_path = nil
-              keepers.each do |key, v|
-                klass = nil
-                next if v.nil?
-
-                # Not the same as the last path?
-                if this_path && v.path != this_path.split(',').map(&:to_sym) && !is_has_one
-                  # puts sub_obj.class.name
-                  if respond_to?(:around_import_save)
-                    # Send them the sub_obj even if it might be invalid so they can choose
-                    # to make it valid if they wish.
-                    # binding.pry
-                    around_import_save(sub_obj) do |modded_obj = nil|
-                      modded_obj = (modded_obj || sub_obj)
-                      modded_obj.save if sub_obj&.valid?
-                    end
-                  elsif sub_obj&.valid?
-                    # binding.pry if sub_obj.is_a?(Employee) && sub_obj.first_name == 'Andrew'
-                    sub_obj.save
-                  end
-                end
-                sub_obj = obj
-                this_path = +''
-                v.path.each_with_index do |path_part, idx|
-                  this_path << (this_path.blank? ? path_part.to_s : ",#{path_part}")
-                  unless (sub_next = sub_objects[this_path])
-                    # Check if we're hitting platform data / a lookup thing
-                    assoc = v.prefix_assocs[idx]
-                    # belongs_to some lookup (reference) data
-                    if assoc && reference_models.include?(assoc.class_name)
-                      lookup_match = assoc.klass.find_by(v.name => row[key])
-                      # Do a partial match if this column allows for it
-                      # and we only find one matching result.
-                      if lookup_match.nil? && partials.include?(v.titleize)
-                        lookup_match ||= assoc.klass.where("#{v.name} LIKE '#{row[key]}%'")
-                        lookup_match = (lookup_match.length == 1 ? lookup_match.first : nil)
-                      end
-                      sub_obj.send("#{path_part}=", lookup_match) unless lookup_match.nil?
-                      # Reference data from the platform level means we stop here
-                      sub_obj = nil
-                      break
-                    end
-                    # This works for belongs_to or has_one.  has_many gets sorted below.
-                    # Get existing related object, or create a new one
-                    if (sub_next = sub_obj.send(path_part)).nil?
-                      is_has_one = assoc.is_a?(ActiveRecord::Reflection::HasOneReflection)
-                      klass = Object.const_get(assoc&.class_name)
-                      sub_next = if is_has_one
-                                   has_ones << v.path
-                                   klass.new
-                                 else
-                                   # Try to find a unique item if one is referenced
-                                   sub_bt = nil
-                                   begin
-                                     # Goofs up if trim_prefix isn't the same name as the class, or if it's
-                                     # a self-join?  (like when trim_prefix == 'Reports To')
-                                     # %%% Need to test this more when the self-join is more than one hop away,
-                                     # such as importing orders and having employees come along :)
-                                     # if sub_obj.class == klass
-                                     #   trim_prefix = ''
-                                     #   # binding.pry
-                                     # end
-                                     # %%% Maybe instead of passing in "klass" we can give the belongs_to association and build through that instead,
-                                     # allowing us to nix the klass.new(criteria) line below.
-                                     trim_prefix = v.titleize[0..-(v.name.length + 2)]
-                                     trim_prefix << ' ' unless trim_prefix.blank?
-                                     if klass == sub_obj.class # Self-referencing thing pointing to us?
-                                       # %%% This should be more general than just for self-referencing things.
-                                       sub_cols = cols.map { |c| c.start_with?(trim_prefix) ? c[trim_prefix.length..-1] : nil }
-                                       # assoc
-                                       sub_bt, criteria = klass.find_existing(uniques, sub_cols, starred, import_template, keepers, nil, row, klass, all, '')
-                                     else
-                                       sub_bt, criteria = klass.find_existing(uniques, cols, starred, import_template, keepers, nil, row, klass, all, trim_prefix)
-                                     end
-                                   rescue ::DutyFree::NoUniqueColumnError
-                                     sub_unique = nil
-                                   end
-                                   # Self-referencing shouldn't build a new one if it couldn't find one
-                                   # %%% Can criteria really ever be nil anymore?
-                                   unless klass == sub_obj.class && criteria.empty?
-                                     sub_bt ||= klass.new(criteria || {})
-                                   end
-                                   sub_obj.send("#{path_part}=", sub_bt)
-                                   sub_bt
-                                 end
-                    end
-                    # Look for possible missing polymorphic detail
-                    if assoc.is_a?(ActiveRecord::Reflection::ThroughReflection) &&
-                       (delegate = assoc.send(:delegate_reflection)&.active_record&.reflect_on_association(assoc.source_reflection_name)) &&
-                       delegate.options[:polymorphic]
-                      polymorphics << { parent: sub_next, child: sub_obj, type_col: delegate.foreign_type, id_col: delegate.foreign_key.to_s }
-                    end
-                    # From a has_many?
-                    if sub_next.is_a?(ActiveRecord::Associations::CollectionProxy)
-                      # Try to find a unique item if one is referenced
-                      # %%% There is possibility that when bringing in related classes using a nil
-                      # in IMPORT_TEMPLATE[:all] that this will break.  Need to test deeply nested things.
-                      start = (v.pre_prefix.blank? ? 0 : v.pre_prefix.length)
-                      trim_prefix = v.titleize[start..-(v.name.length + 2)]
-                      trim_prefix << ' ' unless trim_prefix.blank?
-                      klass = sub_next.klass
-                      # binding.pry if klass.name == 'OrderDetail'
-
-                      # assoc.inverse_of is the belongs_to side of the has_many train we came in here on.
-                      sub_hm, criteria = klass.find_existing(uniques, cols, starred, import_template, keepers, assoc.inverse_of, row, sub_next, all, trim_prefix)
-
-                      # If still not found then create a new related object using this has_many collection
-                      # (criteria.empty? ? nil : sub_next.new(criteria))
-                      sub_next = sub_hm || sub_next.new(criteria)
-                    end
-                    unless sub_next.nil?
-                      # if sub_next.class.name == devise_class && # only for Devise users
-                      #     sub_next.email =~ Devise.email_regexp
-                      #   if existing.include?([sub_next.email])
-                      #     User already exists
-                      #   else
-                      #     sub_next.invite!
-                      #   end
-                      # end
-                      sub_objects[this_path] = sub_next if this_path.present?
-                    end
-                  end
-                  # binding.pry if sub_obj.reports_to
-                  sub_obj = sub_next #if sub_next
-                end
-                # binding.pry if sub_obj.nil?
-                next if sub_obj.nil?
+    private
 
-                sym = "#{v.name}=".to_sym
-                next unless sub_obj.respond_to?(sym)
+      def _defined_uniques(uniques, cols = [], col_list = nil, starred = [], trim_prefix = '')
+        col_list ||= cols.join('|')
+        unless (defined_uniq = (@defined_uniques ||= {})[col_list])
+          utilised = {} # Track columns that have been referenced thusfar
+          defined_uniq = uniques.each_with_object({}) do |unique, s|
+            if unique.is_a?(Array)
+              key = []
+              value = []
+              unique.each do |unique_part|
+                val = (unique_part_name = unique_part.to_s.titleize).start_with?(trim_prefix) &&
+                      cols.index(upn = unique_part_name[trim_prefix.length..-1])
+                next unless val
 
-                col_type = (sub_class = sub_obj.class).columns_hash[v.name.to_s]&.type
-                if col_type.nil? && (virtual_columns = import_template[:virtual_columns]) &&
-                   (virtual_columns = virtual_columns[this_path] || virtual_columns)
-                  col_type = virtual_columns[v.name]
-                end
-                if col_type == :boolean
-                  if row[key].nil?
-                    # Do nothing when it's nil
-                  elsif %w[yes y].include?(row[key]&.downcase) # Used to cover 'true', 't', 'on'
-                    row[key] = true
-                  elsif %w[no n].include?(row[key]&.downcase) # Used to cover 'false', 'f', 'off'
-                    row[key] = false
-                  else
-                    row_errors[v.name] ||= []
-                    row_errors[v.name] << "Boolean value \"#{row[key]}\" in column #{key + 1} not recognized"
-                  end
-                end
-                # binding.pry if v.name.to_s == 'first_name' && sub_obj.first_name == 'Nancy'
-                sub_obj.send(sym, row[key])
-                # else
-                #   puts "  #{sub_class.name} doesn't respond to #{sym}"
-              end
-              # Try to save a final sub-object if one exists
-              sub_obj.save if sub_obj && this_path && !is_has_one && sub_obj.valid?
-
-              # Wire up has_one associations
-              has_ones.each do |hasone|
-                parent = sub_objects[hasone[0..-2].map(&:to_s).join(',')] || obj
-                hasone_object = sub_objects[hasone.map(&:to_s).join(',')]
-                parent.send("#{hasone[-1]}=", hasone_object) if parent.new_record? || hasone_object.valid?
+                key << upn
+                value << val
               end
-
-              # Reinstate any missing polymorphic _type and _id values
-              polymorphics.each do |poly|
-                if !poly[:parent].new_record? || poly[:parent].save
-                  poly[:child].send("#{poly[:type_col]}=".to_sym, poly[:parent].class.name)
-                  poly[:child].send("#{poly[:id_col]}=".to_sym, poly[:parent].id)
-                end
+              unless key.empty?
+                s[key] = value
+                utilised[key] = nil
               end
-
-              # Give a window of opportunity to tweak user objects controlled by Devise
-              obj_class = obj.class
-              is_do_save = if obj_class.respond_to?(:before_devise_save) && obj_class.name == devise_class
-                             obj_class.before_devise_save(obj, existing)
-                           else
-                             true
-                           end
-
-              if obj.valid?
-                obj.save if is_do_save
-                # Snag back any changes to the unique columns.  (For instance, Devise downcases email addresses.)
-                existing_unique = valid_unique.keys.inject([]) { |s, v| s << obj.send(v).to_s }
-                # Update the duplicate counts and inserted / updated results
-                counts[existing_unique] << row_num
-                (is_insert ? inserts : updates) << { row_num => existing_unique } if is_do_save
-                # Track this new object so we can properly sense any duplicates later
-                existing[existing_unique] = obj.id
-              else
-                row_errors.merge! obj.errors.messages
+            else
+              val = (unique_name = unique.to_s.titleize).start_with?(trim_prefix) &&
+                    cols.index(un = unique_name[trim_prefix.length..-1])
+              if val
+                s[[un]] = [val]
+                utilised[[un]] = nil
               end
-              errors << { row_num => row_errors } unless row_errors.empty?
             end
-          end
-          duplicates = counts.each_with_object([]) do |v, s|
-            s += v.last[1..-1].map { |line_num| { line_num => v.first } } if v.last.count > 1
             s
           end
-          # Check to see if they want to do anything after the import
-          ret = { inserted: inserts, updated: updates, duplicates: duplicates, errors: errors }
-          if @after_import ||= (import_template[:after_import]) # || some generic after_import)
-            ret = ret2 if (ret2 = @after_import.call(ret)).is_a?(Hash)
+          if defined_uniq.empty?
+            (starred - utilised.keys).each { |star| defined_uniq[[star]] = [cols.index(star)] }
+            # %%% puts "Tried to establish #{defined_uniq.inspect}"
           end
+          @defined_uniques[col_list] = defined_uniq
         end
-        ret
+        defined_uniq
       end
 
       # For use with importing, based on the provided column list calculate all valid combinations
       # of unique columns.  If there is no valid combination, throws an error.
-      # Returns an object found by this means.
-      def find_existing(uniques, cols, starred, import_template, keepers, train_we_came_in_here_on, row = nil, obj = nil, all = nil, trim_prefix = '')
-        col_name_offset = trim_prefix.length
-        @valid_uniques ||= {} # Fancy memoisation
+      # Returns an object found by this means, as well as the criteria that was used to find it.
+      def _find_existing(uniques, cols, starred, import_template, keepers, train_we_came_in_here_on,
+                         row = nil, klass_or_collection = nil, template_all = nil, trim_prefix = '',
+                         assoc = nil, base_obj = nil)
+        unless trim_prefix.blank?
+          cols = cols.map { |c| c.start_with?(trim_prefix) ? c[trim_prefix.length..-1] : nil }
+          starred = starred.each_with_object([]) do |v, s|
+            s << v[trim_prefix.length..-1] if v.start_with?(trim_prefix)
+            s
+          end
+        end
         col_list = cols.join('|')
-        unless (vus = @valid_uniques[col_list])
-          # Find all unique combinations that are available based on incoming columns, and
-          # pair them up with column number mappings.
-          template_column_objects = ::DutyFree::Extensions._recurse_def(self, all || import_template[:all], import_template).first
+
+        # First add in foreign key stuff we can find from belongs_to associations (other than the
+        # one we might have arrived here upon).
+        criteria = {} # Enough detail to find or build a new object
+        bt_criteria = {}
+        bt_criteria_all_nil = true
+        bt_col_indexes = []
+        available_bts = []
+        only_valid_uniques = (train_we_came_in_here_on == false)
+        uniq_lookups = {} # The data, or how to look up the data
+
+        vus = ((@valid_uniques ||= {})[col_list] ||= {}) # Fancy memoisation
+
+        # First, get an overall list of AVAILABLE COLUMNS before considering tricky foreign key stuff.
+        # ============================================================================================
+        # Generate a list of column names matched up with their zero-ordinal column number mapping for
+        # all columns from the incoming import data.
+        if (is_new_vus = vus.empty?)
+          template_column_objects = ::DutyFree::Extensions._recurse_def(
+            self,
+            template_all || import_template[:all],
+            import_template
+          ).first
           available = if trim_prefix.blank?
                         template_column_objects.select { |col| col.pre_prefix.blank? && col.prefix.blank? }
                       else
@@ -452,167 +202,693 @@ module DutyFree
                           trim_prefix_snake == "#{this_prefix}_"
                         end
                       end.map { |avail| avail.name.to_s.titleize }
-          vus = defined_uniques(uniques, cols, nil, starred).select do |k, _v|
-            is_good = true
-            k.each do |k_col|
-              unless k_col.start_with?(trim_prefix) && available.include?(k_col[col_name_offset..-1])
-                is_good = false
-                break
-              end
-            end
-            is_good
-          end
-          @valid_uniques[col_list] = vus
-        end
-
-        # Make sure they have at least one unique combination to take cues from
-        ret = {}
-        unless vus.empty? # raise NoUniqueColumnError.new(I18n.t('import.no_unique_column_error'))
-          # Convert the first entry to a simplified hash, such as:
-          #   {[:investigator_institutions_name, :investigator_institutions_email] => [8, 9], ...}
-          #     to {:name => 8, :email => 9}
-          key, val = vus.first
-          key.each_with_index do |k, idx|
-            ret[k[col_name_offset..-1].downcase.tr(' ', '_').to_sym] = val[idx] if k.start_with?(trim_prefix)
-          end
         end
 
-        # %%% If uniqueness is based on something else hanging out on a belongs_to then we're pretty hosed.
-        # (Case in point, importing Order with related Order Detail and Product, and then Product needs to
-        # be found or built first before OrderDetail.)
-        # Might have to do a deferred save kind of thing, and also make sure the product stuff came first
-        # before the other stuff
+        # Process FOREIGN KEY stuff by going through each belongs_to in this model.
+        # =========================================================================
+        # This list of all valid uniques will help to filter which foreign keys are kept, and also
+        # get further filtered later to arrive upon a final set of valid uniques.  (Often but not
+        # necessarily a specific valid unique as perhaps with a list of users you want to update some
+        # folks based on having their email as a unique identifier, and other folks by having a
+        # combination of their name and street address as unique, and use both of those possible
+        # unique variations to update phone numbers, and do that all as a part of one import.)
+        all_vus = _defined_uniques(uniques, cols, col_list, starred, trim_prefix)
 
-        # Find by all corresponding columns
+        # %%% Ultimately may consider making this recursive
+        reflect_on_all_associations.each do |sn_bt|
+          next unless sn_bt.belongs_to? && (!train_we_came_in_here_on || sn_bt != train_we_came_in_here_on)
 
-        # Add in any foreign key stuff we can find from other belongs_to associations
-        # %%% This is starting to look like the other BelongsToAssociation code above around line
-        # 697, so it really needs to be turned into something recursive instead of this two-layer
-        # thick thing at best.
+          # # %%% Make sure there's a starred column we know about from this one
+          # uniq_lookups[sn_bt.foreign_key] = nil if only_valid_uniques
 
-        # First check the belongs_tos
-        criteria = {}
-        bt_criteria = {}
-        bt_criteria_all_nil = true
-        bt_col_indexes = []
-        only_valid_uniques = (train_we_came_in_here_on == false)
-        bts = reflect_on_all_associations.each_with_object([]) do |sn_assoc, s|
-          if sn_assoc.is_a?(ActiveRecord::Reflection::BelongsToReflection) &&
-             (!train_we_came_in_here_on || sn_assoc != train_we_came_in_here_on) # &&
-             # sn_assoc.klass != self # Omit stuff pointing to us (like self-referencing stuff)
-            # %%% Make sure there's a starred column we know about from this one
-            ret[sn_assoc.foreign_key] = nil if only_valid_uniques
-            s << sn_assoc
-          end
-          s
-        end
-        bts.each do |sn_bt|
           # This search prefix becomes something like "Order Details Product "
-          # binding.pry
           cols.each_with_index do |bt_col, idx|
             next if bt_col_indexes.include?(idx) ||
-                    !bt_col&.start_with?(trim_prefix + "#{sn_bt.name.to_s.underscore.tr('_', ' ').titleize} ")
+                    !bt_col&.start_with?(bt_prefix = (trim_prefix + "#{sn_bt.name.to_s.underscore.tr('_', ' ').titleize} "))
 
+            available_bts << bt_col
             fk_id = if row
-                      # Max ID so if there are multiple, only the most recent one is picked.
+                      # Max ID so if there are multiple matches, only the most recent one is picked.
                       # %%% Need to stack these up in case there are multiple
                       # (like first_name, last_name on a referenced employee)
-                      # binding.pry
                       sn_bt.klass.where(keepers[idx].name => row[idx]).limit(1).pluck(MAX_ID).first
                     else
+                      # elsif is_new_vus
+                      #   # Add to our criteria if this belongs_to is required
+                      #   bt_req_by_default = sn_bt.klass.respond_to?(:belongs_to_required_by_default) &&
+                      #                       sn_bt.klass.belongs_to_required_by_default
+                      #   unless !vus.values.first&.include?(idx) &&
+                      #          (sn_bt.options[:optional] || (sn_bt.options[:required] == false) || !bt_req_by_default)
+                      #     # # Add this fk to the criteria
+                      #     # criteria[fk_name] = fk_id
+
+                      #     ref = [keepers[idx].name, idx]
+                      #     # bt_criteria[(fk_name = sn_bt.foreign_key)] ||= [sn_bt.klass, []]
+                      #     # bt_criteria[fk_name].last << ref
+                      #     # bt_criteria[bt_col] = [sn_bt.klass, ref]
+
+                      #     # Maybe this is the most useful
+                      #     # First array is friendly column names, second is references
+                      #     foreign_uniques = (bt_criteria[sn_bt.name] ||= [sn_bt.klass, [], []])
+                      #     foreign_uniques[1] << ref
+                      #     foreign_uniques[2] << bt_col
+                      #     vus[bt_col] = foreign_uniques # And we can look up this growing set from any foreign column
                       [sn_bt.klass, keepers[idx].name, idx]
                     end
             if fk_id
               bt_col_indexes << idx
               bt_criteria_all_nil = false
             end
+            # If we're processing a row then this list of foreign key column name entries, named such as
+            # "order_id" or "product_id" instead of column-specific stuff like "Order Date" and "Product Name",
+            # is kept until the last and then gets merged on top of the other criteria before being returned.
             bt_criteria[(fk_name = sn_bt.foreign_key)] = fk_id
-            # Add to our criteria if this belongs_to is required
-            # %%% Rails older than 5.0 handles this stuff differently!
-            unless sn_bt.options[:optional] || !sn_bt.klass.belongs_to_required_by_default
-              criteria[fk_name] = fk_id
-            else # Should not have this fk as a requirement
-              ret.delete(fk_name) if only_valid_uniques && ret.include?(fk_name)
+
+            # Check to see if belongs_tos are generally required on this specific table
+            bt_req_by_default = sn_bt.klass.respond_to?(:belongs_to_required_by_default) &&
+                                sn_bt.klass.belongs_to_required_by_default
+
+            # Add to our CRITERIA just the belongs_to things that check out.
+            # ==============================================================
+            # The first check, "all_vus.keys.first.none? { |k| k.start_with?(bt_prefix) }"
+            # is to see if one of the columns we're working with from the unique that we've chosen
+            # comes from the table referenced by this belongs_to (sn_bt).
+            #
+            # The second check on the :optional option and bt_req_by_default comes directly from
+            # how Rails 5 and later checks to see if a specific belongs_to is marked optional
+            # (or required), and without having that indication will fall back on checking the model
+            # itself to see if it requires belongs_tos by default.
+            next if all_vus.keys.first.none? { |k| k.start_with?(bt_prefix) } &&
+                    (sn_bt.options[:optional] || !bt_req_by_default)
+
+            # Add to the criteria
+            criteria[fk_name] = fk_id
+          end
+        end
+
+        # Now circle back find a final list of VALID UNIQUES by re-assessing the list of all valid uniques
+        # in relation to the available belongs_tos found in the last foreign key step.
+        if is_new_vus
+          available += available_bts
+          all_vus.each do |k, v|
+            combined_k = []
+            combined_v = []
+            k.each_with_index do |key, idx|
+              if available.include?(key)
+                combined_k << key
+                combined_v << v[idx]
+              end
             end
+            vus[combined_k] = combined_v unless combined_k.empty?
           end
         end
 
+        # uniq_lookups = vus.inject({}) do |s, v|
+        #   return s if available_bts.include?(v.first) # These will be provided in criteria, and not uniq_lookups
+
+        #   # uniq_lookups[k[trim_prefix.length..-1].downcase.tr(' ', '_').to_sym] = val[idx] if k.start_with?(trim_prefix)
+        #   s[v.first.downcase.tr(' ', '_').to_sym] = v.last
+        #   s
+        # end
+
         new_criteria_all_nil = bt_criteria_all_nil
-        if train_we_came_in_here_on != false
-          criteria = ret.each_with_object({}) do |v, s|
-            next if bt_col_indexes.include?(v.last)
 
-            new_criteria_all_nil = false if (s[v.first.to_sym] = row[v.last])
-            s
+        # Make sure they have at least one unique combination to take cues from
+        unless vus.empty? # raise NoUniqueColumnError.new(I18n.t('import.no_unique_column_error'))
+          # Convert the first entry to a simplified hash, such as:
+          #   {[:investigator_institutions_name, :investigator_institutions_email] => [8, 9], ...}
+          #     to {:name => 8, :email => 9}
+          key, val = vus.first # Utilise the first identified set of valid uniques
+          key.each_with_index do |k, idx|
+            next if available_bts.include?(k) # These will be provided in criteria, and not uniq_lookups
+
+            # uniq_lookups[k[trim_prefix.length..-1].downcase.tr(' ', '_').to_sym] = val[idx] if k.start_with?(trim_prefix)
+            k_sym = k.downcase.tr(' ', '_').to_sym
+            v = val[idx]
+            uniq_lookups[k_sym] = v # The column number in which to find the data
+
+            next if only_valid_uniques || bt_col_indexes.include?(v)
+
+            # Find by all corresponding columns
+            if (row_value = row[v])
+              new_criteria_all_nil = false
+              criteria[k_sym] = row_value # The data, or how to look up the data
+            end
           end
         end
 
-        # Short-circuiting this to only get back the valid_uniques?
-        return ret.merge(criteria) if only_valid_uniques
-
-        # binding.pry if obj.is_a?(Order)
+        return uniq_lookups.merge(criteria) if only_valid_uniques
         # If there's nothing to match upon then we're out
         return [nil, {}] if new_criteria_all_nil
 
-        # With this criteria, find any matching has_many row we can so we can update it
-        sub_hm = obj.find do |hm_obj|
-          is_good = true
-          criteria.each do |k, v|
-            if hm_obj.send(k).to_s != v.to_s
-              is_good = false
-              break
+        # With this criteria, find any matching has_many row we can so we can update it.
+        # First try directly looking it up through ActiveRecord.
+        klass_or_collection ||= self # Comes in as nil for has_one with no object yet attached
+        # HABTM proxy
+        # binding.pry if klass_or_collection.is_a?(ActiveRecord::Associations::CollectionProxy)
+        # if klass_or_collection.respond_to?(:proxy_association) && klass_or_collection.proxy_association.options.include?(:through)
+        # klass_or_collection.proxy_association.association_scope.to_a
+
+        # if assoc.respond_to?(:require_association) && klass_or_collection.is_a?(Array)
+        #   # else
+        #   #   klass_or_collection = assoc.klass
+        #   end
+        # end
+        found_object = case klass_or_collection
+                       when ActiveRecord::Base # object from a has_one?
+                         existing_object = klass_or_collection
+                         klass_or_collection = klass_or_collection.class
+                         other_object = klass_or_collection.find_by(criteria)
+                         pk = klass_or_collection.primary_key
+                         existing_object.send(pk) == other_object&.send(pk) ? existing_object : other_object
+                       when Array # has_* in AR < 4.0
+                         # Old AR doesn't have a CollectionProxy that can do any of this on its own.
+                         base_id = base_obj.send(base_obj.class.primary_key)
+                         if assoc.macro == :has_and_belongs_to_many || (assoc.macro == :has_many && assoc.options[:through])
+                           # Find all association foreign keys, then find or create the foreign object
+                           # based on criteria, and finally put an entry with both foreign keys into
+                           # the associative table unless it already exists.
+                           ajt = assoc.through_reflection&.table_name || assoc.join_table
+                           fk = assoc.foreign_key
+                           afk = assoc.association_foreign_key
+                           existing_ids = ActiveRecord::Base.connection.execute(
+                             "SELECT #{afk} FROM #{ajt} WHERE #{fk} = #{base_id}"
+                           ).map { |r| r[afk] }
+                           new_or_existing = assoc.klass.find_or_create_by(criteria)
+                           new_or_existing_id = new_or_existing.send(new_or_existing.class.primary_key)
+                           unless existing_ids.include?(new_or_existing_id)
+                             ActiveRecord::Base.connection.execute(
+                               "INSERT INTO #{ajt} (#{fk}, #{afk}) VALUES (#{base_id}, #{new_or_existing_id})"
+                             )
+                           end
+                           new_or_existing
+                         else # Must be a has_many
+                           assoc.klass.find_or_create_by(criteria.merge({ assoc.foreign_key => base_id }))
+                         end
+                       else
+                         klass_or_collection.find_by(criteria)
+                       end
+        # If not successful, such as when fields are exposed via helper methods instead of being
+        # real columns in the database tables, try this more intensive approach.  This is useful
+        # if you had full name kind of data coming in on a spreadsheeet, but in the destination
+        # table it's broken out to first_name, middle_name, surname.  By writing both full_name
+        # and full_name= methods, the importer can check to see if this entry is already there,
+        # and put a new row in if not, having one incoming name break out to populate three
+        # destination columns.
+        unless found_object || klass_or_collection.is_a?(Array)
+          found_object = klass_or_collection.find do |obj|
+            is_good = true
+            criteria.each do |k, v|
+              if obj.send(k).to_s != v.to_s
+                is_good = false
+                break
+              end
             end
+            is_good
           end
-          is_good
         end
-        # Try looking it up through ActiveRecord
-        # %%% Should we perhaps do this first before the more intensive find routine above?
-        sub_hm = obj.find_by(criteria) if sub_hm.nil?
-        [sub_hm, criteria.merge(bt_criteria)]
-      end
+        # Standard criteria as well as foreign key column name detail with exact foreign keys
+        # that match up to a primary key so that if needed a new related object can be built,
+        # complete with all its association detail.
+        [found_object, criteria.merge(bt_criteria)]
+      end # _find_existing
+    end # module ClassMethods
 
-    private
+    # With an array of incoming data, the first row having column names, perform the import
+    def self.import(obj_klass, data, import_template = nil)
+      instance_variable_set(:@defined_uniques, nil)
+      instance_variable_set(:@valid_uniques, nil)
+
+      import_template ||= if obj_klass.constants.include?(:IMPORT_TEMPLATE)
+                            obj_klass::IMPORT_TEMPLATE
+                          else
+                            obj_klass.suggest_template(0, false, false)
+                          end
+      # puts "Chose #{import_template}"
+      inserts = []
+      updates = []
+      counts = Hash.new { |h, k| h[k] = [] }
+      errors = []
+
+      is_first = true
+      uniques = nil
+      cols = nil
+      starred = []
+      partials = []
+      # See if we can find the model if given only a string
+      if obj_klass.is_a?(String)
+        obj_klass_camelized = obj_klass.camelize.singularize
+        obj_klass = Object.const_get(obj_klass_camelized) if Object.const_defined?(obj_klass_camelized)
+      end
+      table_name = obj_klass.table_name unless obj_klass.is_a?(String)
+      is_build_table = if import_template.include?(:all!)
+                         # Search for presence of this table
+                         table_name = obj_klass.underscore.pluralize if obj_klass.is_a?(String)
+                         !ActiveRecord::ConnectionAdapters::SchemaStatements.table_exists?(table_name)
+                       else
+                         false
+                       end
+      # If we do need to build the table then we require an :all!, otherwise in the case that the table
+      # does not need to be built or was already built then try :all, and fall back on :all!.
+      all = import_template[is_build_table ? :all! : :all] || import_template[:all!]
+      keepers = {}
+      valid_unique = nil
+      existing = {}
+      devise_class = ''
+      ret = nil
+
+      # Multi-tenancy gem Apartment can be used if there are separate schemas per tenant
+      reference_models = if Object.const_defined?('Apartment')
+                           Apartment.excluded_models
+                         else
+                           []
+                         end
+
+      if Object.const_defined?('Devise')
+        Object.const_get('Devise') # If this fails, devise_class will remain a blank string.
+        devise_class = Devise.mappings.values.first.class_name
+        reference_models -= [devise_class]
+      else
+        devise_class = ''
+      end
 
-      def defined_uniques(uniques, cols = [], col_list = nil, starred = [])
-        col_list ||= cols.join('|')
-        @defined_uniques ||= {}
-        unless (defined_uniq = @defined_uniques[col_list])
-          utilised = {} # Track columns that have been referenced thusfar
-          defined_uniq = uniques.each_with_object({}) do |unique, s|
-            if unique.is_a?(Array)
-              key = []
-              value = []
-              unique.each do |unique_part|
-                val = cols.index(unique_part_name = unique_part.to_s.titleize)
-                next if val.nil?
+      # Did they give us a filename?
+      if data.is_a?(String)
+        # Filenames with full paths can not be longer than 4096 characters, and can not
+        # include newline characters
+        data = if data.length <= 4096 && !data.index('\n')
+                 File.open(data)
+               else
+                 # Any multi-line string is likely CSV data
+                 # %%% Test to see if TAB characters are present on the first line, instead of commas
+                 CSV.new(data)
+               end
+      end
+      # Or perhaps us a file?
+      if data.is_a?(File)
+        # Use the "roo" gem if it's available
+        # When we're ready to try parsing this thing on our own, shared strings and all, then use
+        # the rubyzip gem also along with it:
+        # https://github.com/rubyzip/rubyzip
+        # require 'zip'
+        data = if Object.const_defined?('Roo::Spreadsheet', { csv_options: { encoding: 'bom|utf-8' } })
+                 Roo::Spreadsheet.open(data)
+               else
+                 # Otherwise generic CSV parsing
+                 require 'csv' unless Object.const_defined?('CSV')
+                 CSV.open(data)
+               end
+      end
 
-                key << unique_part_name
-                value << val
+      # Will show as just one transaction when using auditing solutions such as PaperTrail
+      ActiveRecord::Base.transaction do
+        # Check to see if they want to do anything before the whole import
+        # First if defined in the import_template, then if there is a method in the class,
+        # and finally (not yet implemented) a generic global before_import
+        my_before_import = import_template[:before_import]
+        my_before_import ||= respond_to?(:before_import) && method(:before_import)
+        # my_before_import ||= some generic my_before_import
+        if my_before_import
+          last_arg_idx = my_before_import.parameters.length - 1
+          arguments = [data, import_template][0..last_arg_idx]
+          data = ret if (ret = my_before_import.call(*arguments)).is_a?(Enumerable)
+        end
+        build_tables = nil
+        data.each_with_index do |row, row_num|
+          row_errors = {}
+          if is_first # Anticipate that first row has column names
+            uniques = import_template[:uniques]
+
+            # Look for UTF-8 BOM in very first cell
+            row[0] = row[0][3..-1] if row[0].start_with?([239, 187, 191].pack('U*'))
+            # How about a first character of FEFF or FFFE to support UTF-16 BOMs?
+            #   FE FF big-endian (standard)
+            #   FF FE little-endian
+            row[0] = row[0][1..-1] if [65_279, 65_534].include?(row[0][0].ord)
+            cols = row.map { |col| (col || '').strip }
+
+            # Unique column combinations can be called out explicitly in models using uniques: {...}, or to just
+            # define one column at a time simply mark with an asterisk.
+            # Track and clean up stars
+            starred = cols.select do |col|
+              if col[0] == '*'
+                col.slice!(0)
+                col.strip!
               end
-              unless key.empty?
-                s[key] = value
-                utilised[key] = nil
+            end
+            partials = cols.select do |col|
+              if col[0] == '~'
+                col.slice!(0)
+                col.strip!
               end
+            end
+            cols.map! { |col| ::DutyFree::Util._clean_name(col, import_template[:as]) }
+            obj_klass.send(:_defined_uniques, uniques, cols, cols.join('|'), starred)
+            # Main object asking for table to be built?
+            build_tables = {}
+            build_tables[path_name] = [namespaces, is_need_model, is_need_table] if is_build_table
+            # Make sure that at least half of them match what we know as being good column names
+            template_column_objects = ::DutyFree::Extensions._recurse_def(obj_klass, import_template[:all], import_template, build_tables).first
+            cols.each_with_index do |col, idx|
+              # prefixes = col_detail.pre_prefix + (col_detail.prefix.blank? ? [] : [col_detail.prefix])
+              # %%% Would be great here if when one comes back nil, try to find the closest match
+              # and indicate to the user a "did you mean?" about it.
+              keepers[idx] = template_column_objects.find { |col_obj| col_obj.titleize == col }
+              # puts "Could not find a match for column #{idx + 1}, #{col}" if keepers[idx].nil?
+            end
+            raise ::DutyFree::LessThanHalfAreMatchingColumnsError, I18n.t('import.altered_import_template_coumns') if keepers.length < (cols.length / 2) - 1
+
+            # Returns just the first valid unique lookup set if there are multiple
+            valid_unique = obj_klass.send(:_find_existing, uniques, cols, starred, import_template, keepers, false)
+            # Make a lookup from unique values to specific IDs
+            existing = obj_klass.pluck(*([:id] + valid_unique.keys)).each_with_object(existing) do |v, s|
+              s[v[1..-1].map(&:to_s)] = v.first
+              s
+            end
+            is_first = false
+          else # Normal row of data
+            is_insert = false
+            existing_unique = valid_unique.inject([]) do |s, v|
+              s << if v.last.is_a?(Array)
+                     v.last[0].where(v.last[1] => row[v.last[2]]).limit(1).pluck(MAX_ID).first.to_s
+                   else
+                     row[v.last].to_s
+                   end
+            end
+            to_be_saved = []
+            # Check to see if they want to preprocess anything
+            existing_unique = @before_process.call(valid_unique, existing_unique) if @before_process ||= import_template[:before_process]
+            if (criteria = existing[existing_unique])
+              obj = obj_klass.find(criteria)
             else
-              val = cols.index(unique_part_name = unique.to_s.titleize)
-              unless val.nil?
-                s[[unique_part_name]] = [val]
-                utilised[[unique_part_name]] = nil
+              is_insert = true
+              # unless build_tables.empty? # include?()
+              #   binding.pry
+              #   x = 5
+              # end
+              to_be_saved << [obj = obj_klass.new]
+            end
+            sub_obj = nil
+            polymorphics = []
+            sub_objects = {}
+            this_path = nil
+            keepers.each do |key, v|
+              next if v.nil?
+
+              sub_obj = obj
+              this_path = +''
+              # puts "p: #{v.path}"
+              v.path.each_with_index do |path_part, idx|
+                this_path << (this_path.blank? ? path_part.to_s : ",#{path_part}")
+                unless (sub_next = sub_objects[this_path])
+                  # Check if we're hitting reference data / a lookup thing
+                  assoc = v.prefix_assocs[idx]
+                  # belongs_to some lookup (reference) data
+                  if assoc && reference_models.include?(assoc.class_name)
+                    lookup_match = assoc.klass.find_by(v.name => row[key])
+                    # Do a partial match if this column allows for it
+                    # and we only find one matching result.
+                    if lookup_match.nil? && partials.include?(v.titleize)
+                      lookup_match ||= assoc.klass.where("#{v.name} LIKE '#{row[key]}%'")
+                      lookup_match = (lookup_match.length == 1 ? lookup_match.first : nil)
+                    end
+                    sub_obj.send("#{path_part}=", lookup_match) unless lookup_match.nil?
+                    # Reference data from the public level means we stop here
+                    sub_obj = nil
+                    break
+                  end
+                  # Get existing related object, or create a new one
+                  # This first part works for belongs_to.  has_many and has_one get sorted below.
+                  # start = (v.pre_prefix.blank? ? 0 : v.pre_prefix.length)
+                  start = 0
+                  trim_prefix = v.titleize[start..-(v.name.length + 2)]
+                  trim_prefix << ' ' unless trim_prefix.blank?
+                  if (sub_next = sub_obj.send(path_part)).nil? && assoc.belongs_to?
+                    klass = Object.const_get(assoc&.class_name)
+                    # Try to find a unique item if one is referenced
+                    sub_next = nil
+                    begin
+                      sub_next, criteria = klass.send(:_find_existing, uniques, cols, starred, import_template, keepers, nil, row, klass, all, trim_prefix, assoc)
+                    rescue ::DutyFree::NoUniqueColumnError
+                    end
+                    # puts "#{v.path} #{criteria.inspect}"
+                    bt_name = "#{path_part}="
+                    unless sub_next || (klass == sub_obj.class && criteria.empty?)
+                      sub_next = klass.new(criteria || {})
+                      to_be_saved << [sub_next, sub_obj, bt_name, sub_next]
+                    end
+                    # This wires it up in memory, but doesn't yet put the proper foreign key ID in
+                    # place when the primary object is a new one (and thus not having yet been saved
+                    # doesn't yet have an ID).
+                    # binding.pry if !sub_next.new_record? && sub_next.name == 'Squidget Widget' # !sub_obj.changed?
+                    # # %%% Question is -- does the above set changed? when a foreign key is not yet set
+                    # # and only the in-memory object has changed?
+                    is_yet_changed = sub_obj.changed?
+                    sub_obj.send(bt_name, sub_next)
+
+                    # We need this in the case of updating the primary object across a belongs_to when
+                    # the foreign one already exists and is not otherwise changing, such as when it is
+                    # not a new one, so wouldn't otherwise be getting saved.
+                    to_be_saved << [sub_obj] if !sub_obj.new_record? && !is_yet_changed && sub_obj.changed?
+                  # From a has_many or has_one?
+                  # Rails 4.0 and later can do:  sub_next.is_a?(ActiveRecord::Associations::CollectionProxy)
+                  elsif [:has_many, :has_one, :has_and_belongs_to_many].include?(assoc.macro) # && !assoc.options[:through]
+                    ::DutyFree::Extensions._save_pending(to_be_saved)
+                    # Try to find a unique item if one is referenced
+                    # %%% There is possibility that when bringing in related classes using a nil
+                    # in IMPORT_TEMPLATE[:all] that this will break.  Need to test deeply nested things.
+
+                    # assoc.inverse_of is the belongs_to side of the has_many train we came in here on.
+                    sub_hm, criteria = assoc.klass.send(:_find_existing, uniques, cols, starred, import_template, keepers, assoc.inverse_of,
+                                                        row, sub_next, all, trim_prefix, assoc,
+                                                        # Just in case we're running Rails < 4.0 and this is a haas_*
+                                                        sub_obj)
+                    # If still not found then create a new related object using this has_many collection
+                    # (criteria.empty? ? nil : sub_next.new(criteria))
+                    if sub_hm
+                      sub_next = sub_hm
+                    elsif assoc.macro == :has_one
+                      # assoc.active_record.name.underscore is only there to support older Rails
+                      # that doesn't do automatic inverse_of
+                      ho_name = "#{assoc.inverse_of&.name || assoc.active_record.name.underscore}="
+                      sub_next = assoc.klass.new(criteria)
+                      to_be_saved << [sub_next, sub_next, ho_name, sub_obj]
+                    elsif assoc.macro == :has_and_belongs_to_many ||
+                          (assoc.macro == :has_many && assoc.options[:through])
+                      # sub_next = sub_next.new(criteria)
+                      # Search for one to wire up if it might already exist, otherwise create one
+                      sub_next = assoc.klass.find_by(criteria) || assoc.klass.new(criteria)
+                      to_be_saved << [sub_next, :has_and_belongs_to_many, assoc.name, sub_obj]
+                    else
+                      # Two other methods that are possible to check for here are :conditions and
+                      # :sanitized_conditions, which do not exist in Rails 4.0 and later.
+                      sub_next = if assoc.respond_to?(:require_association)
+                                   # With Rails < 4.0, sub_next could come in as an Array or a broken CollectionProxy
+                                   assoc.klass.new({ ::DutyFree::Extensions._fk_from(assoc) => sub_obj.send(sub_obj.class.primary_key) }.merge(criteria))
+                                 else
+                                   sub_next.proxy_association.reflection.instance_variable_set(:@foreign_key, ::DutyFree::Extensions._fk_from(assoc))
+                                   sub_next.new(criteria)
+                                 end
+                      to_be_saved << [sub_next]
+                    end
+                    # else
+                    # belongs_to for a found object, or a HMT
+                  end
+                  # # Incompatible with Rails < 4.2
+                  # # Look for possible missing polymorphic detail
+                  # # Maybe can test for this via assoc.through_reflection
+                  # if assoc.is_a?(ActiveRecord::Reflection::ThroughReflection) &&
+                  #    (delegate = assoc.send(:delegate_reflection)&.active_record&.reflect_on_association(assoc.source_reflection_name)) &&
+                  #    delegate.options[:polymorphic]
+                  #   polymorphics << { parent: sub_next, child: sub_obj, type_col: delegate.foreign_type, id_col: delegate.foreign_key.to_s }
+                  # end
+
+                  # rubocop:disable Style/SoleNestedConditional
+                  unless sub_next.nil?
+                    # if sub_next.class.name == devise_class && # only for Devise users
+                    #     sub_next.email =~ Devise.email_regexp
+                    #   if existing.include?([sub_next.email])
+                    #     User already exists
+                    #   else
+                    #     sub_next.invite!
+                    #   end
+                    # end
+                    sub_objects[this_path] = sub_next if this_path.present?
+                  end
+                  # rubocop:enable Style/SoleNestedConditional
+                end
+                sub_obj = sub_next
+              end
+              next if sub_obj.nil?
+
+              next unless sub_obj.respond_to?(sym = "#{v.name}=".to_sym)
+
+              col_type = sub_obj.class.columns_hash[v.name.to_s]&.type
+              if col_type.nil? && (virtual_columns = import_template[:virtual_columns]) &&
+                 (virtual_columns = virtual_columns[this_path] || virtual_columns)
+                col_type = virtual_columns[v.name]
               end
+              if col_type == :boolean
+                if row[key].nil?
+                  # Do nothing when it's nil
+                elsif %w[true t yes y].include?(row[key]&.strip&.downcase) # Used to cover 'on'
+                  row[key] = true
+                elsif %w[false f no n].include?(row[key]&.strip&.downcase) # Used to cover 'off'
+                  row[key] = false
+                else
+                  row_errors[v.name] ||= []
+                  row_errors[v.name] << "Boolean value \"#{row[key]}\" in column #{key + 1} not recognized"
+                end
+              end
+
+              is_yet_changed = sub_obj.changed?
+              sub_obj.send(sym, row[key])
+              # If this one is transitioning from having not changed to now having been changed,
+              # and is not a new one anyway that would already be lined up to get saved, then we
+              # mark it to now be saved.
+              to_be_saved << [sub_obj] if !sub_obj.new_record? && !is_yet_changed && sub_obj.changed?
+              # else
+              #   puts "  #{sub_obj.class.name} doesn't respond to #{sym}"
             end
+            # Try to save final sub-object(s) if any exist
+            ::DutyFree::Extensions._save_pending(to_be_saved)
+
+            # Reinstate any missing polymorphic _type and _id values
+            polymorphics.each do |poly|
+              if !poly[:parent].new_record? || poly[:parent].save
+                poly[:child].send("#{poly[:type_col]}=".to_sym, poly[:parent].class.name)
+                poly[:child].send("#{poly[:id_col]}=".to_sym, poly[:parent].id)
+              end
+            end
+
+            # Give a window of opportunity to tweak user objects controlled by Devise
+            obj_class = obj.class
+            is_do_save = if obj_class.respond_to?(:before_devise_save) && obj_class.name == devise_class
+                           obj_class.before_devise_save(obj, existing)
+                         else
+                           true
+                         end
+
+            if obj.valid?
+              obj.save if is_do_save
+              # Snag back any changes to the unique columns.  (For instance, Devise downcases email addresses.)
+              existing_unique = valid_unique.keys.inject([]) { |s, v| s << obj.send(v).to_s }
+              # Update the duplicate counts and inserted / updated results
+              counts[existing_unique] << row_num
+              (is_insert ? inserts : updates) << { row_num => existing_unique } if is_do_save
+              # Track this new object so we can properly sense any duplicates later
+              existing[existing_unique] = obj.id
+            else
+              row_errors.merge! obj.errors.messages
+            end
+            errors << { row_num => row_errors } unless row_errors.empty?
           end
-          (starred - utilised.keys).each { |star| defined_uniq[[star]] = [cols.index(star)] }
-          @defined_uniques[col_list] = defined_uniq
         end
-        defined_uniq
+        duplicates = counts.each_with_object([]) do |v, s|
+          s += v.last[1..-1].map { |line_num| { line_num => v.first } } if v.last.count > 1
+          s
+        end
+        ret = { inserted: inserts, updated: updates, duplicates: duplicates, errors: errors }
+
+        # Check to see if they want to do anything after the import
+        # First if defined in the import_template, then if there is a method in the class,
+        # and finally (not yet implemented) a generic global after_import
+        my_after_import = import_template[:after_import]
+        my_after_import ||= respond_to?(:after_import) && method(:after_import)
+        # my_after_import ||= some generic my_after_import
+        if my_after_import
+          last_arg_idx = my_after_import.parameters.length - 1
+          arguments = [ret][0..last_arg_idx]
+          # rubocop:disable Lint/UselessAssignment
+          ret = ret2 if (ret2 = my_after_import.call(*arguments)).is_a?(Hash)
+          # rubocop:enable Lint/UselessAssignment
+        end
       end
-    end # module ClassMethods
+      ret
+    end
+
+    def self._fk_from(assoc)
+      # Try first to trust whatever they've marked as being the foreign_key, and then look
+      # at the inverse's foreign key setting if available.  In all cases don't accept
+      # anything that's not backed with a real column in the table.
+      col_names = assoc.klass.column_names
+      if (
+           (fk_name = assoc.options[:foreign_key]) ||
+           (fk_name = assoc.inverse_of&.options&.fetch(:foreign_key) { nil }) ||
+           (assoc.respond_to?(:foreign_key) && (fk_name = assoc.foreign_key)) ||
+           (fk_name = assoc.inverse_of&.foreign_key) ||
+           (fk_name = assoc.inverse_of&.association_foreign_key)
+         ) && col_names.include?(fk_name.to_s)
+        return fk_name
+      end
+
+      # Don't let this fool you -- we really are in search of the foreign key name here,
+      # and Rails 3.0 and older used some fairly interesting conventions, calling it instead
+      # the "primary_key_name"!
+      if assoc.respond_to?(:primary_key_name)
+        if (fk_name = assoc.primary_key_name) && col_names.include?(fk_name.to_s)
+          return fk_name
+        end
+        if (fk_name = assoc.inverse_of.primary_key_name) && col_names.include?(fk_name.to_s)
+          return fk_name
+        end
+      end
+
+      puts "* Wow, had no luck at all finding a foreign key for #{assoc.inspect}"
+    end
+
+    # unless build_tables.include?((foreign_class = tbs[2].class).underscore)
+    # build_table(build_tables, tbs[1].class, foreign_class, :has_one)
+
+    # Called before building any object linked through a has_one or has_many so that foreign key IDs
+    # can be added properly to those new objects.  Finally at the end also called to save everything.
+    def self._save_pending(to_be_saved)
+      while (tbs = to_be_saved.pop)
+        # puts "Will be calling #{tbs[1].class.name} #{tbs[1]&.id} .#{tbs[2]} #{tbs[3].class.name} #{tbs[3]&.id}"
+        # Wire this one up if it had come from a has_one
+        if tbs[0] == tbs[1]
+          tbs[1].class.has_one(tbs[2]) unless tbs[1].respond_to?(tbs[2])
+          tbs[1].send(tbs[2], tbs[3])
+        end
+
+        ais = (tbs.first.class.respond_to?(:around_import_save) && tbs.first.class.method(:around_import_save)) ||
+              (respond_to?(:around_import_save) && method(:around_import_save))
+        if ais
+          # Send them the sub_obj even if it might be invalid so they can choose
+          # to make it valid if they wish.
+          ais.call(tbs.first) do |modded_obj = nil|
+            modded_obj = (modded_obj || tbs.first)
+            modded_obj.save if modded_obj&.valid?
+          end
+        elsif tbs.first.valid?
+          tbs.first.save
+        else
+          puts "* Unable to save #{tbs.first.inspect}"
+        end
+
+        next if tbs[1].nil? || # From a has_many?
+                tbs[0] == tbs[1] || # From a has_one?
+                tbs.first.new_record?
+
+        if tbs[1] == :has_and_belongs_to_many # also used by has_many :through associations
+          collection = tbs[3].send(tbs[2])
+          being_shoveled_id = tbs[0].send(tbs[0].class.primary_key)
+          if collection.empty? ||
+             !collection.pluck("#{(klass = collection.first.class).table_name}.#{klass.primary_key}").include?(being_shoveled_id)
+            collection << tbs[0]
+            # puts collection.inspect
+          end
+        else # Traditional belongs_to
+          tbs[1].send(tbs[2], tbs[3])
+        end
+      end
+    end
 
     # The snake-cased column alias names used in the query to export data
     def self._template_columns(klass, import_template = nil)
       template_detail_columns = klass.instance_variable_get(:@template_detail_columns)
-      if (template_import_columns = klass.instance_variable_get(:@template_import_columns)) != import_template
-        klass.instance_variable_set(:@template_import_columns, template_import_columns = import_template)
+      if klass.instance_variable_get(:@template_import_columns) != import_template
+        klass.instance_variable_set(:@template_import_columns, import_template)
         klass.instance_variable_set(:@template_detail_columns, (template_detail_columns = nil))
       end
       unless template_detail_columns
@@ -623,39 +899,79 @@ module DutyFree
       template_detail_columns
     end
 
-    # Recurse and return two arrays -- one with all columns in sequence, and one a hierarchy of
-    # nested hashes to be used with ActiveRecord's .joins() to facilitate export.
-    def self._recurse_def(klass, array, import_template, assocs = [], joins = [], pre_prefix = '', prefix = '')
-      # Confirm we can actually navigate through this association
-      prefix_assoc = (assocs.last&.klass || klass).reflect_on_association(prefix) if prefix.present?
-      assocs = assocs.dup << prefix_assoc unless prefix_assoc.nil?
+    # Recurse and return three arrays -- one with all columns in sequence, and one a hierarchy of
+    # nested hashes to be used with ActiveRecord's .joins() to facilitate export, and finally
+    # one that lists tables that need to be built along the way.
+    def self._recurse_def(klass, cols, import_template, build_tables = nil, order_by = nil, assocs = [], joins = [], pre_prefix = '', prefix = '')
+      prefix = prefix[0..-2] if (is_build_table = prefix.end_with?('!'))
       prefixes = ::DutyFree::Util._prefix_join([pre_prefix, prefix])
-      array = array.inject([]) do |s, col|
+
+      if prefix.present?
+        # An indication to build this table and model if it doesn't exist?
+        if is_build_table && build_tables
+          namespaces = prefix.split('::')
+          model_name = namespaces.map { |part| part.singularize.camelize }.join('::')
+          prefix = namespaces.last
+          # %%% If the model already exists, take belongs_to cues from it for building the table
+          if (is_need_model = Object.const_defined?(model_name)) &&
+             (is_need_table = ActiveRecord::ConnectionAdapters::SchemaStatements.table_exists?(
+               (path_name = ::DutyFree::Util._prefix_join([prefixes, prefix.pluralize]))
+             ))
+            is_build_table = false
+          else
+            build_tables[path_name] = [namespaces, is_need_model, is_need_table] unless build_tables.include?(path_name)
+          end
+        end
+        unless is_build_table && build_tables
+          # Confirm we can actually navigate through this association
+          prefix_assoc = (assocs.last&.klass || klass).reflect_on_association(prefix) if prefix.present?
+          if prefix_assoc
+            assocs = assocs.dup << prefix_assoc
+            if order_by && [:has_many, :has_and_belongs_to_many].include?(prefix_assoc.macro) &&
+               (pk = prefix_assoc.active_record.primary_key)
+              order_by << ["#{prefixes.tr('.', '_')}_", pk]
+            end
+          end
+        end
+      end
+      cols = cols.inject([]) do |s, col|
         s + if col.is_a?(Hash)
               col.inject([]) do |s2, v|
-                joins << { v.first.to_sym => (joins_array = []) }
-                s2 += _recurse_def(klass, (v.last.is_a?(Array) ? v.last : [v.last]), import_template, assocs, joins_array, prefixes, v.first.to_sym).first
+                if order_by
+                  # Find what the type is for this guy
+                  next_klass = (assocs.last&.klass || klass).reflect_on_association(v.first)&.klass
+                  # Used to be:  { v.first.to_sym => (joins_array = []) }
+                  joins << { v.first.to_sym => (joins_array = [next_klass]) }
+                end
+                s2 + _recurse_def(klass, (v.last.is_a?(Array) ? v.last : [v.last]), import_template, build_tables, order_by, assocs, joins_array, prefixes, v.first.to_sym).first
               end
             elsif col.nil?
               if assocs.empty?
                 []
               else
                 # Bring in from another class
-                joins << { prefix => (joins_array = []) }
+                # Used to be:  { prefix => (joins_array = []) }
+                # %%% Probably need a next_klass thing like above
+                joins << { prefix => (joins_array = [klass]) } if order_by
                 # %%% Also bring in uniques and requireds
-                _recurse_def(klass, assocs.last.klass::IMPORT_TEMPLATE[:all], import_template, assocs, joins_array, prefixes).first
+                _recurse_def(klass, assocs.last.klass::IMPORT_TEMPLATE[:all], import_template, build_tables, order_by, assocs, joins_array, prefixes).first
               end
             else
               [::DutyFree::Column.new(col, pre_prefix, prefix, assocs, klass, import_template[:as])]
             end
       end
-      [array, joins]
+      [cols, joins]
     end
   end # module Extensions
+  # rubocop:enable Style/CommentedKeyword
 
-  class NoUniqueColumnError < ActiveRecord::RecordNotUnique
+  # Rails < 4.0 doesn't have ActiveRecord::RecordNotUnique, so use the more generic ActiveRecord::ActiveRecordError instead
+  ar_not_unique_error = ActiveRecord.const_defined?('RecordNotUnique') ? ActiveRecord::RecordNotUnique : ActiveRecord::ActiveRecordError
+  class NoUniqueColumnError < ar_not_unique_error
   end
 
-  class LessThanHalfAreMatchingColumnsError < ActiveRecord::RecordInvalid
+  # Rails < 4.2 doesn't have ActiveRecord::RecordInvalid, so use the more generic ActiveRecord::ActiveRecordError instead
+  ar_invalid_error = ActiveRecord.const_defined?('RecordInvalid') ? ActiveRecord::RecordInvalid : ActiveRecord::ActiveRecordError
+  class LessThanHalfAreMatchingColumnsError < ar_invalid_error
   end
 end