duty_free 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d07568c8c7a1692981435e098bd8426d17f30cd733ffff01a7b5a4e4fee4a9
-  data.tar.gz: 1d2ef595a271f40e5489cac67e576b4f85338d43d46bff26c6e5a6d706766a00
+  metadata.gz: aa22e01d02997c6b8bc562f19805d1f0f529e17793b0dd14282f43840ea2c86c
+  data.tar.gz: afa848b412ea1514e0afeaa36ba1093ccb1baecdd4384d225b07f76145e9457e
 SHA512:
-  metadata.gz: 4bdd6c53f65cb096de1c2da724a735ecee7ceaed464627f69adbb816b3afa20c85a202cce201a7ee5d35e52ae31663c7f8a9c02d47bc11ea7ead86cebfb0972f
-  data.tar.gz: 4664e2b6e724f3bba469ef1907b82fe25d90761251ff5cabb204bd75e1a64b522ba3a438438a76e5d58e80952870334abb8194d9d0199b6e2addb2143120b5fa
+  metadata.gz: c60d6f2a72d34f4f99d3f9fea16b0ed2d1ff71b6088e4b6782a0b54decc15ef5ba45cef17f846079f4e5a55fd2f5dfcf25945b80351ff6006318b59fedcffd13
+  data.tar.gz: 6be734a732268268ef86768d88215e62b947c97326d823f3b631bab16de3f919877fedbf4184da1e1490904a752ed8e675bb173966cb9f2922860ae0b606020d

data/lib/duty_free/column.rb

@@ -28,7 +28,9 @@ module DutyFree
       # sql_col = ::DutyFree::Util._prefix_join([table_name.compact.join('_'), name])
 
       # Foolproof way, using the AREL mapping:
-      sql_col = ::DutyFree::Util._prefix_join([mapping["#{pre_prefix.tr('.', '_')}_#{prefix}_"], name])
+      this_pre_prefix = pre_prefix.tr('.', '_')
+      this_pre_prefix << '_' unless pre_prefix.blank?
+      sql_col = ::DutyFree::Util._prefix_join([mapping["#{this_pre_prefix}#{prefix}_"], name])
       sym = to_sym.to_s
       sql_col == sym ? sql_col : "#{sql_col} AS #{sym}"
     end

data/lib/duty_free/extensions.rb

@@ -46,7 +46,7 @@ module DutyFree
           end
           (is_required ? '* ' : '') + col
         end
-        rows = Array(rows)
+        rows = [rows]
 
         if is_with_data
           # Automatically create a JOINs strategy and select list to get back all related rows
@@ -55,8 +55,7 @@ module DutyFree
 
           # So we can properly create the SELECT list, create a mapping between our
           # column alias prefixes and the aliases AREL creates.
-          # Warning: Delegating ast to arel is deprecated and will be removed in Rails 6.0
-          arel_alias_names = ::DutyFree::Util._recurse_arel(relation.ast.cores.first.source)
+          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
 
@@ -87,7 +86,7 @@ module DutyFree
                             else
                               suggest_template(0, false, false)
                             end
-        puts "Chose #{import_template}"
+        # puts "Chose #{import_template}"
         inserts = []
         updates = []
         counts = Hash.new { |h, k| h[k] = [] }
@@ -581,7 +580,7 @@ module DutyFree
         klass.instance_variable_set(:@template_detail_columns, (template_detail_columns = nil))
       end
       unless template_detail_columns
-        puts "* Redoing *"
+        # puts "* Redoing *"
         template_detail_columns = _recurse_def(klass, import_template[:all], import_template).first.map(&:to_sym)
         klass.instance_variable_set(:@template_detail_columns, template_detail_columns)
       end

data/lib/duty_free/version_number.rb

@@ -5,7 +5,7 @@ module DutyFree
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 1
+    TINY = 2
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duty_free
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Lorin Thwaits