rom-sql 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d964bf81ba3e921c992aff816f2c09bc1c91c3a
-  data.tar.gz: 1f8516a4f8420e4a009d41b98d9d1f1dd9bcb608
+  metadata.gz: 8a59a75e6eb28bd684acbd721bf2718637ec3463
+  data.tar.gz: eb2281b8bb5f156d73056e1b56f8a58fa7fa174a
 SHA512:
-  metadata.gz: 21ac8dc3534190ed1a72d6b0a798cdc60c0ff9207995a304a9edfc44356e41c53a0123fa49718b91b7c093cd53060d1c1adb15a2fd02694e85ceaf310b7647aa
-  data.tar.gz: 63dcf1fcc5c3bc2e5f4dc09335eb2da9138abf83790934daf725651df004c5333e4f15669a7a64c2c78160ffd9326a25fe4feec0d75d1dbbee19b7b41f88ba2d
+  metadata.gz: 3385bfffcc897f83b3d7c0a77d93d4a7bb9ff3416be241fe9df53e5b8a4c38371a196461d8f7b7c90dcf99f2083cfe876fcfe109b86d3fe3910913c8537fc95a
+  data.tar.gz: 6c4cf20e4be86dc15f49162657ced6df27818c8d3c4a12bf966ce327541a585ce8d94ad7c2ad003ee318e442ae5611b4f4979114e099947b5627ba82264e9bf4

data/CHANGELOG.md

@@ -1,9 +1,26 @@
+## v2.2.0 2017-11-02
+
+### Added
+
+* Relation registry is passed as an argument to DSL blocks (in `select`, `where`, `order` etc.), which enables syntax like `select { |r| [id, r.tasks[:title]] }` (solnic)
+* Support for self-referenced many-to-many associations (solnic)
+* PG's geometric types include meta data about db types (GustavoCaso)
+
+### Fixed
+
+* Custom schema is used correctly in command results (solnic)
+* Schemas no longer finalize PKs (this is done in core schema already) (solnic)
+
+[Compare v2.1.0...v2.2.0](https://github.com/rom-rb/rom-sql/compare/v2.1.0...v2.2.0)
+
 ## v2.1.0 2017-10-23
 
 ### Added
 
 * Support for PG's range types (v-kolesnikov)
 * Support for PG's `ltree` (GustavoCaso + solnic)
+* Support for the `FILTER` clause (flash-gordon)
+* PG's array types will use custom types for processing members ie `ltree[]` will use `LTree` type (solnic)
 
 ### Fixed
 

data/lib/rom/sql/associations/many_to_many.rb

@@ -1,11 +1,13 @@
 require 'rom/associations/many_to_many'
 require 'rom/sql/associations/core'
+require 'rom/sql/associations/self_ref'
 
 module ROM
   module SQL
     module Associations
       class ManyToMany < ROM::Associations::ManyToMany
         include Associations::Core
+        include Associations::SelfRef
 
         # @api public
         def call(target: self.target)
@@ -22,7 +24,7 @@ module ROM
               target_schema
             end.qualified
 
-          relation = left.join(source.name.dataset, join_keys)
+          relation = left.join(source_table, join_keys)
 
           if view
             apply_view(schema, relation)
@@ -43,11 +45,6 @@ module ROM
           { source_attr => target_attr }
         end
 
-        # @api public
-        def source_attr
-          source[source_key].qualified
-        end
-
         # @api public
         def target_attr
           join_relation[target_key].qualified

data/lib/rom/sql/dsl.rb

@@ -1,18 +1,26 @@
+require 'rom/constants'
+
 module ROM
   module SQL
     # @api private
     class DSL < BasicObject
-      # @api private
+      # @!attribute [r] schema
+      #   @return [SQL::Schema]
       attr_reader :schema
 
+      # @!attribute [r] relations
+      #   @return [Hash, RelationRegistry]
+      attr_reader :relations
+
       # @api private
       def initialize(schema)
         @schema = schema
+        @relations = schema.respond_to?(:relations) ? schema.relations : EMPTY_HASH
       end
 
       # @api private
       def call(&block)
-        result = instance_exec(&block)
+        result = instance_exec(relations, &block)
 
         if result.is_a?(::Array)
           result

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

@@ -5,13 +5,29 @@ module ROM
   module SQL
     module Postgres
       module Commands
+        # @api private
+        module Core
+          private
+
+          # Common dataset used by create/update commands
+          #
+          # @return [Sequel::Dataset]
+          #
+          # @api private
+          def returning_dataset
+            relation.dataset.returning(*relation.columns)
+          end
+        end
+
         module Create
+          include Core
+
           # Executes insert statement and returns inserted tuples
           #
           # @api private
           def insert(tuples)
             dataset = tuples.flat_map do |tuple|
-              relation.dataset.returning.insert(tuple)
+              returning_dataset.insert(tuple)
             end
 
             wrap_dataset(dataset)
@@ -21,7 +37,7 @@ module ROM
           #
           # @api private
           def multi_insert(tuples)
-            relation.dataset.returning.multi_insert(tuples)
+            returning_dataset.multi_insert(tuples)
           end
 
           # Executes upsert statement (INSERT with ON CONFLICT clause)
@@ -29,17 +45,18 @@ module ROM
           #
           # @api private
           def upsert(tuple, opts = EMPTY_HASH)
-            relation.dataset.returning.insert_conflict(opts).insert(tuple)
+            returning_dataset.insert_conflict(opts).insert(tuple)
           end
         end
 
         module Update
+          include Core
+
           # Executes update statement and returns updated tuples
           #
           # @api private
           def update(tuple)
-            dataset = relation.dataset.returning.update(tuple)
-            wrap_dataset(dataset)
+            wrap_dataset(returning_dataset.update(tuple))
           end
         end
 

data/lib/rom/sql/extensions/postgres/types/geometric.rb

@@ -32,100 +32,114 @@ module ROM
         # The list of geometric data types supported by PostgreSQL
         # @see https://www.postgresql.org/docs/current/static/datatype-geometric.html
 
-        Point = SQL::Types.define(Values::Point) do
-          input do |point|
-            "(#{ point.x },#{ point.y })"
-          end
+        Point = Type('point') do
+          SQL::Types.define(Values::Point) do
+            input do |point|
+              "(#{ point.x },#{ point.y })"
+            end
 
-          output do |point|
-            x, y = point.to_s[1...-1].split(',', 2)
-            Values::Point.new(Float(x), Float(y))
+            output do |point|
+              x, y = point.to_s[1...-1].split(',', 2)
+              Values::Point.new(Float(x), Float(y))
+            end
           end
         end
 
-        Line = SQL::Types.define(Values::Line) do
-          input do |line|
-            "{#{ line.a },#{ line.b },#{line.c}}"
-          end
+        Line = Type('line') do
+          SQL::Types.define(Values::Line) do
+            input do |line|
+              "{#{ line.a },#{ line.b },#{line.c}}"
+            end
 
-          output do |line|
-            a, b, c = line.to_s[1..-2].split(',', 3)
-            Values::Line.new(Float(a), Float(b), Float(c))
+            output do |line|
+              a, b, c = line.to_s[1..-2].split(',', 3)
+              Values::Line.new(Float(a), Float(b), Float(c))
+            end
           end
         end
 
-        Circle = SQL::Types.define(Values::Circle) do
-          input do |circle|
-            "<(#{ circle.center.x },#{ circle.center.y }),#{ circle.radius }>"
-          end
+        Circle = Type('circle') do
+          SQL::Types.define(Values::Circle) do
+            input do |circle|
+              "<(#{ circle.center.x },#{ circle.center.y }),#{ circle.radius }>"
+            end
 
-          output do |circle|
-            x, y, r = circle.to_s.tr('()<>', '').split(',', 3)
-            center = Values::Point.new(Float(x), Float(y))
-            Values::Circle.new(center, Float(r))
+            output do |circle|
+              x, y, r = circle.to_s.tr('()<>', '').split(',', 3)
+              center = Values::Point.new(Float(x), Float(y))
+              Values::Circle.new(center, Float(r))
+            end
           end
         end
 
-        Box = SQL::Types.define(Values::Box) do
-          input do |box|
-            "((#{ box.upper_right.x },#{ box.upper_right.y }),"\
-            "(#{ box.lower_left.x },#{ box.lower_left.y }))"
-          end
+        Box = Type('box') do
+          SQL::Types.define(Values::Box) do
+            input do |box|
+              "((#{ box.upper_right.x },#{ box.upper_right.y }),"\
+              "(#{ box.lower_left.x },#{ box.lower_left.y }))"
+            end
 
-          output do |box|
-            x_right, y_right, x_left, y_left = box.to_s.tr('()', '').split(',', 4)
-            upper_right = Values::Point.new(Float(x_right), Float(y_right))
-            lower_left = Values::Point.new(Float(x_left), Float(y_left))
-            Values::Box.new(upper_right, lower_left)
+            output do |box|
+              x_right, y_right, x_left, y_left = box.to_s.tr('()', '').split(',', 4)
+              upper_right = Values::Point.new(Float(x_right), Float(y_right))
+              lower_left = Values::Point.new(Float(x_left), Float(y_left))
+              Values::Box.new(upper_right, lower_left)
+            end
           end
         end
 
-        LineSegment = SQL::Types.define(Values::LineSegment) do
-          input do |segment|
-            "[(#{ segment.begin.x },#{ segment.begin.y }),"\
-            "(#{ segment.end.x },#{ segment.end.y })]"
-          end
+        LineSegment = Type('lseg') do
+          SQL::Types.define(Values::LineSegment) do
+            input do |segment|
+              "[(#{ segment.begin.x },#{ segment.begin.y }),"\
+              "(#{ segment.end.x },#{ segment.end.y })]"
+            end
 
-          output do |segment|
-            x_begin, y_begin, x_end, y_end = segment.to_s.tr('()[]', '').split(',', 4)
-            point_begin = Values::Point.new(Float(x_begin), Float(y_begin))
-            point_end = Values::Point.new(Float(x_end), Float(y_end))
-            Values::LineSegment.new(point_begin, point_end)
+            output do |segment|
+              x_begin, y_begin, x_end, y_end = segment.to_s.tr('()[]', '').split(',', 4)
+              point_begin = Values::Point.new(Float(x_begin), Float(y_begin))
+              point_end = Values::Point.new(Float(x_end), Float(y_end))
+              Values::LineSegment.new(point_begin, point_end)
+            end
           end
         end
 
-        Polygon = SQL::Types.define(::Array) do
-          input do |points|
-            points_joined = points.map { |p| "(#{ p.x },#{ p.y })" }.join(',')
-            "(#{ points_joined })"
-          end
+        Polygon = Type('polygon') do
+          SQL::Types.define(::Array) do
+            input do |points|
+              points_joined = points.map { |p| "(#{ p.x },#{ p.y })" }.join(',')
+              "(#{ points_joined })"
+            end
 
-          output do |polygon|
-            coordinates = polygon.to_s.tr('()', '').split(',').each_slice(2)
-            coordinates.map { |x, y| Values::Point.new(Float(x), Float(y)) }
+            output do |polygon|
+              coordinates = polygon.to_s.tr('()', '').split(',').each_slice(2)
+              coordinates.map { |x, y| Values::Point.new(Float(x), Float(y)) }
+            end
           end
         end
 
-        Path = SQL::Types.define(Values::Path) do
-          input do |path|
-            points_joined = path.to_a.map { |p| "(#{ p.x },#{ p.y })" }.join(',')
+        Path = Type('path') do
+          SQL::Types.define(Values::Path) do
+            input do |path|
+              points_joined = path.to_a.map { |p| "(#{ p.x },#{ p.y })" }.join(',')
 
-            if path.open?
-              "[#{ points_joined }]"
-            else
-              "(#{ points_joined })"
+              if path.open?
+                "[#{ points_joined }]"
+              else
+                "(#{ points_joined })"
+              end
             end
-          end
 
-          output do |path|
-            open = path.to_s.start_with?('[') && path.to_s.end_with?(']')
-            coordinates = path.to_s.tr('()[]', '').split(',').each_slice(2)
-            points = coordinates.map { |x, y| Values::Point.new(Float(x), Float(y)) }
+            output do |path|
+              open = path.to_s.start_with?('[') && path.to_s.end_with?(']')
+              coordinates = path.to_s.tr('()[]', '').split(',').each_slice(2)
+              points = coordinates.map { |x, y| Values::Point.new(Float(x), Float(y)) }
 
-            if open
-              Values::Path.new(points, :open)
-            else
-              Values::Path.new(points, :closed)
+              if open
+                Values::Path.new(points, :open)
+              else
+                Values::Path.new(points, :closed)
+              end
             end
           end
         end

data/lib/rom/sql/restriction_dsl.rb

@@ -6,7 +6,7 @@ module ROM
     class RestrictionDSL < DSL
       # @api private
       def call(&block)
-        instance_exec(&block)
+        instance_exec(relations, &block)
       end
 
       # Returns a result of SQL EXISTS clause.

data/lib/rom/sql/schema.rb

@@ -145,7 +145,6 @@ module ROM
       def finalize_attributes!(options = EMPTY_HASH)
         super do
           @attributes = map(&:qualified)
-          initialize_primary_key_names
         end
       end
 

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -79,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM