umbrellio-sequel-plugins 0.3.0.62 → 0.3.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5491ca47e62aebd09d14f3cbbb576f27eeacfdaa
-  data.tar.gz: 6589599be43f330906153fe3c48b8b862b119072
+  metadata.gz: d5a62467c7b304dfb4e42ca312d464c3fcfecf69
+  data.tar.gz: 340da5aa8aa43bd09a5a231ff66a0901baa2d647
 SHA512:
-  metadata.gz: 14d95afdc741d64ad49c19d991c5eb4bea170e4a838ca6234e05743ab32bf5400d36b10d14944cbda632ccce856e59937ae56fa312fe4e4baf6142bef8538a42
-  data.tar.gz: 98a9448f7a647574504dad542c584590d1ead5f2fba79573d7074fd83d713dca748a99dde1e36737fdc07dc1ec112bb4799409266521792dd73d33d4f59c3f70
+  metadata.gz: 86d81572f6b945e4c75fb00636b10060b2e38b940c1482dae01e1995bf691377ab1ab64f8b07c567550fde7c4b68b28435e60fc804d818c05ef5cebba991caa6
+  data.tar.gz: 8e8221c2e60197c269b196ef362622a8e34dffdeec4b5c35b87b4a3d04b48b855a5a85ed68d5a387726827158aa7bf9514414fc8ae84baf93f012acdb12bdbf5

data/lib/sequel/extensions/currency_rates.rb

@@ -7,8 +7,9 @@ module Sequel
     #
     # @param aliaz [Symbol] alias to be used for joined table
     # @param table [Symbol] table name to join to
-    # @param currency_column [Symbol] currency column by which table is joined
-    # @param time_column [Symbol] time column by which table is joined
+    # @param currency_column [Symbol or Sequel::SQL::Expression] currency column by which
+    #   table is joined
+    # @param time_column [Symbol or Sequel::SQL::Expression] time column by which table is joined
     #
     # @example
     #   Order::Model.with_rates.select(Sequel[:amount].in_usd)
@@ -22,8 +23,11 @@ module Sequel
     )
       table = Sequel[table]
       rates = Sequel[aliaz]
-      join_expr = table[currency_column] =~ rates[:currency]
-      join_expr &= rates[:period].pg_range.contains(table[time_column])
+
+      currency_expr = wrap_if_symbol(currency_column, table)
+      time_expr = wrap_if_symbol(time_column, table)
+
+      join_expr = (rates[:currency] =~ currency_expr) & rates[:period].pg_range.contains(time_expr)
       left_join(rates_table.as(aliaz), join_expr)
     end
 
@@ -33,6 +37,12 @@ module Sequel
     def table_name
       respond_to?(:first_source_alias) ? first_source_alias : super
     end
+
+    private
+
+    def wrap_if_symbol(column_name, table)
+      column_name.is_a?(Symbol) ? table[column_name] : column_name
+    end
   end
 
   module CurrencyRateExchange

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.3.0.62
+  version: 0.3.0.67
 platform: ruby
 authors:
 - nulldef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel