rom-sql 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e9a1c6c69b4539e55608281a06efbb7cac1b8c5723ab96be497aa982ed6677
-  data.tar.gz: 3d1690050c29b5a09f3e72fc952eb32b1e7e5b3e421d0bd157cdeec11bb98c14
+  metadata.gz: 72190a3c5b2df9cf0bc5db0ba2a4cae185f88e87dfa9ad7d0f7cf3967c1fe048
+  data.tar.gz: acd353e5348e8c797275829dacfedb445289e5e76d636df4b5cb7b40c1f48e7b
 SHA512:
-  metadata.gz: 9f1c1f6c059d88c2b5ad4872aea4f071799fdabab42d45a1a8fea4393361925883d4286a6543e58fa5ada1d22cee9fab691086e3f1a82a0f1ceecfac11ef918d
-  data.tar.gz: 42dcefd8414fc1b5a2afe818efff6ed3a410d0aea790ff9400b6f42127990781174ee83944d5791114d3b6fd49208c9a839e76d7afb3007cc19e5b3be2705172
+  metadata.gz: 93bc3e2cb1873865a886d221d34ff164a7d83de2ddaec4f6f3d99daf65465a14ded348c546151ae9d44e6eae6ca4dded468cc7386ff4513d6b02bab843485f14
+  data.tar.gz: 6c45fd11d745c05d1f536700c1cb246dd358e09668a406377281486b3d062c366db847dea96e457170e518e104baf64bb296f41613dd0099b5ffb7e839cd7679

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 3.5.0 2021-03-26
+
+
+### Fixed
+
+- Restored the fix for #390 that was lost by an accident in 3.3.3 and 3.4.0 (@solnic)
+
+### Added
+
+- Support for using partial indixes in PG upsert commands (issue #394 fixed via #395) (@smaximov)
+
+[Compare v3.4.0...v3.5.0](https://github.com/rom-rb/rom-sql/compare/v3.4.0...v3.5.0)
+
 ## 3.4.0 2021-03-19
 
 

data/lib/rom/sql/extensions/postgres/commands.rb

@@ -85,7 +85,7 @@ module ROM
         class Upsert < SQL::Commands::Create
           adapter :sql
 
-          defines :constraint, :conflict_target, :update_statement, :update_where
+          defines :constraint, :conflict_target, :conflict_where, :update_statement, :update_where
 
           # @!attribute [r] constraint
           #  @return [Symbol] the name of the constraint expected to be violated
@@ -95,6 +95,10 @@ module ROM
           #  @return [Object] the column or expression to handle a violation on
           option :conflict_target, default: -> { self.class.conflict_target }
 
+          # @!attribute [r] conflict_where
+          #  @return [Object] the index filter, when using a partial index to determine uniqueness
+          option :conflict_where, default: -> { self.class.conflict_where }
+
           # @!attribute [r] update_statement
           #  @return [Object] the update statement which will be executed in case of a violation
           option :update_statement, default: -> { self.class.update_statement }
@@ -123,6 +127,7 @@ module ROM
             @upsert_options ||= {
               constraint: constraint,
               target: conflict_target,
+              conflict_where: conflict_where,
               update_where: update_where,
               update: update_statement
             }

data/lib/rom/sql/function.rb

@@ -73,18 +73,23 @@ module ROM
       #
       # @api private
       def qualified(table_alias = nil)
-        meta(
-          func: ::Sequel::SQL::Function.new(func.name, *func.args.map { |arg| arg.respond_to?(:qualified) ? arg.qualified(table_alias) : arg })
-        )
+        new { |arg|
+          arg.respond_to?(:qualified) ? arg.qualified(table_alias) : arg
+        }
       end
 
       # @see Attribute#qualified_projection
       #
       # @api private
       def qualified_projection(table_alias = nil)
-        meta(
-          func: ::Sequel::SQL::Function.new(func.name, *func.args.map { |arg| arg.respond_to?(:qualified_projection) ? arg.qualified_projection(table_alias) : arg })
-        )
+        new { |arg|
+          arg.respond_to?(:qualified_projection) ? arg.qualified_projection(table_alias) : arg
+        }
+      end
+
+      # @api private
+      def new(&block)
+        meta(func: ::Sequel::SQL::Function.new!(func.name, func.args.map(&block), func.opts))
       end
 
       # @see Attribute#qualified?

data/lib/rom/sql/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module SQL
-    VERSION = '3.4.0'.freeze
+    VERSION = '3.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: SQL databases support for ROM