rom-sql 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da70a1471f9c0b3a27f10cacf6af54f060090be
-  data.tar.gz: 1f391fdbd269bbf0df9d0af23a5fc112948ce1f2
+  metadata.gz: 4fdb75ab8064473be4552789976b049b939ed356
+  data.tar.gz: 3c2cc1dd4f7ee9428f6a2f45a2ecc1368c6e5882
 SHA512:
-  metadata.gz: f91c5854d45dc52b26ddb0eaca6dc465ff02db69bd145d6ce010c6eaa93571ac46842d68a6897e0b88fffb7639efe26c94435a035c0d4a0790be37defd846fa2
-  data.tar.gz: 879cf6a660eb79ab84b1adbfb33ede96613d786356457182d81bc3f00f2a7165fbe939d25b7bd0755242710469cffae650976252c9c19eeda37067a89a0407ec
+  metadata.gz: a96f739270f64f4828b7d777d949b6b20bfd7161c6a19813347d1f0fdbdbe4f125c387195ab01dc184fbac06ab3faf83cfda76e608f212937336529663fd4d87
+  data.tar.gz: af5dbaba037a0ef816b32af01ba4b2c504eaf6310463d244b38e79304b8b4face04137857b9c12f9b30c87c73cb044e369153a0e6b8322f9d5949b0ef689cc91

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
-sudo: false
+dist: trusty
+sudo: required
 cache: bundler
 services:
   - postgresql
@@ -7,27 +8,23 @@ services:
 bundler_args: --without yard guard benchmarks tools
 before_script:
   - psql -c 'create database rom_sql;' -U postgres
-  - mysql -e 'create database rom_sql;'
+  - mysql -u root -e 'create database rom_sql;'
+after_success:
+  - '[ "$TRAVIS_RUBY_VERSION" = "2.3.1" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'
 script: "bundle exec rake ci"
 rvm:
-  - 2.1.9
+  - 2.1.10
   - 2.2.5
   - 2.3.1
-  - rbx-2
-  - jruby-9.0.5.0
-  - ruby-head
+  - rbx-3
+  - jruby
 env:
   global:
     - CODECLIMATE_REPO_TOKEN=03d7f66589572702b12426d2bc71c4de6281a96139e33b335b894264b1f8f0b0
     - JRUBY_OPTS='--dev -J-Xmx1024M'
-    - PG_LTE_95='false'
 matrix:
   allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-  include:
-    - rvm: jruby-head
-      before_install: gem install bundler --no-ri --no-rdoc
+    - rvm: rbx
 notifications:
   webhooks:
     urls:
@@ -35,3 +32,10 @@ notifications:
     on_success: change
     on_failure: always
     on_start: false
+addons:
+  postgresql: 9.5
+  apt:
+    packages:
+      - mysql-server-5.6
+      - mysql-client-core-5.6
+      - mysql-client-5.6

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## v0.9.0 2016-11-08
+
+### Added
+
+* `Associations::{OneToMany,OneToOne}#associate` for merging FKs into child tuple (jodosha)
+* Added support for PostgreSQL types: UUID, Array, JSONB and Money (jodosha)
+* Support for DB specific schema inferrers (flash-gordon)
+* Automatically infer PG arrays and JSON(B) types (jodosha + flash-gordon)
+* Support for `Relation#having` (cflipse)
+
+### Changed
+
+* Inferred types in schemas **are no longer strict** (flash-gordon)
+* PG-specific types are handled by `:postgres` extension and it loads connection extensions automatically (flash-gordon)
+* Make `OneToOne` inherit from `OneToMany` (beauby)
+* Default dataset will use column names from schema if it's available (solnic)
+
+### Fixed
+
+* Floats are inferred by schemas (cflipse)
+
+[Compare v0.8.0...v0.9.0](https://github.com/rom-rb/rom-sql/compare/v0.8.0...v0.9.0)
+
 ## v0.8.0 2016-07-27
 
 ### Added

data/Gemfile

@@ -2,14 +2,22 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rom', github: 'rom-rb/rom', branch: 'master'
+
 group :test do
   gem 'byebug', platforms: :mri
-  gem 'anima', '~> 0.2.0'
-  gem 'virtus'
+  gem 'dry-struct'
   gem 'activesupport', '~> 4.2'
   gem 'rspec', '~> 3.1'
   gem 'codeclimate-test-reporter', require: false
-  gem 'pg', platforms: [:mri, :rbx]
+  gem 'simplecov', require: false
+
+  if RUBY_ENGINE == 'rbx'
+    gem 'pg', '~> 0.18.0', platforms: :rbx
+  else
+    gem 'pg', '~> 0.19', platforms: :mri
+  end
+
   gem 'mysql2', platforms: [:mri, :rbx]
   gem 'jdbc-postgres', platforms: :jruby
   gem 'jdbc-mysql', platforms: :jruby

data/README.md

@@ -13,7 +13,7 @@
 [![Test Coverage](https://codeclimate.com/github/rom-rb/rom-sql/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/rom-rb/rom-sql.svg?branch=master)][inchpages]
 
-RDBMS support for [Ruby Object Mapper](https://github.com/rom-rb/rom).
+SQL support for [rom-rb](https://github.com/rom-rb/rom).
 
 Resources:
 
@@ -36,12 +36,6 @@ Or install it yourself as:
 
     $ gem install rom-sql
 
-Check out [SQL guide](http://rom-rb.org/learn/adapters/sql/) for usage examples.
-
-## ROADMAP
-
-For details please refer to [issues](https://github.com/rom-rb/rom-sql/issues).
-
 ## License
 
 See `LICENSE` file.

data/lib/rom/sql.rb

@@ -2,22 +2,19 @@ require 'dry-equalizer'
 require 'sequel'
 require 'rom'
 
-module ROM
-  MissingConfigurationError = Class.new(StandardError)
-end
+require 'rom/sql/version'
+require 'rom/sql/errors'
 
 require 'rom/configuration_dsl'
 
-require 'rom/sql/version'
-require 'rom/sql/errors'
 require 'rom/sql/plugins'
 require 'rom/sql/relation'
 require 'rom/sql/gateway'
 require 'rom/sql/migration'
+require 'rom/sql/extensions'
 
 if defined?(Rails)
-  require 'rom/sql/support/active_support_notifications'
-  require 'rom/sql/support/rails_log_subscriber'
+  ROM::SQL.load_extensions(:active_support_notifications, :rails_log_subscriber)
 end
 
 ROM.register_adapter(:sql, ROM::SQL)

data/lib/rom/sql/association.rb

@@ -68,8 +68,8 @@ module ROM
   end
 end
 
-require 'rom/sql/association/one_to_one'
 require 'rom/sql/association/one_to_many'
+require 'rom/sql/association/one_to_one'
 require 'rom/sql/association/many_to_many'
 require 'rom/sql/association/many_to_one'
 require 'rom/sql/association/one_to_one_through'

data/lib/rom/sql/association/one_to_many.rb

@@ -1,8 +1,51 @@
 module ROM
   module SQL
     class Association
-      class OneToMany < OneToOne
+      class OneToMany < Association
         result :many
+
+        # @api public
+        def call(relations)
+          with_keys(relations) do |left_pk, right_fk|
+            right = relations[target.relation]
+            columns = right.header.qualified.to_a
+
+            relation = right
+              .inner_join(source, left_pk => right_fk)
+              .select(*columns)
+              .order(*right.header.project(*right.primary_key).qualified)
+
+            relation.with(attributes: relation.header.names)
+          end
+        end
+
+        # @api public
+        def combine_keys(relations)
+          Hash[*with_keys(relations)]
+        end
+
+        # @api public
+        def join_keys(relations)
+          with_keys(relations) { |source_key, target_key|
+            { qualify(source, source_key) => qualify(target, target_key) }
+          }
+        end
+
+        # @api private
+        def associate(relations, child, parent)
+          pk, fk = join_key_map(relations)
+          child.merge(fk => parent.fetch(pk))
+        end
+
+        protected
+
+        # @api private
+        def with_keys(relations, &block)
+          source_key = relations[source.relation].primary_key
+          target_key = relations[target.relation].foreign_key(source.relation)
+          return [source_key, target_key] unless block
+          yield(source_key, target_key)
+        end
       end
     end
   end

data/lib/rom/sql/association/one_to_one.rb

@@ -1,45 +1,8 @@
 module ROM
   module SQL
     class Association
-      class OneToOne < Association
+      class OneToOne < OneToMany
         result :one
-
-        # @api public
-        def call(relations)
-          with_keys(relations) do |left_pk, right_fk|
-            right = relations[target.relation]
-            columns = right.header.qualified.to_a
-
-            relation = right
-              .inner_join(source, left_pk => right_fk)
-              .select(*columns)
-              .order(*right.header.project(*right.primary_key).qualified)
-
-            relation.with(attributes: relation.header.names)
-          end
-        end
-
-        # @api public
-        def combine_keys(relations)
-          Hash[*with_keys(relations)]
-        end
-
-        # @api public
-        def join_keys(relations)
-          with_keys(relations) { |source_key, target_key|
-            { qualify(source, source_key) => qualify(target, target_key) }
-          }
-        end
-
-        protected
-
-        # @api private
-        def with_keys(relations, &block)
-          source_key = relations[source.relation].primary_key
-          target_key = relations[target.relation].foreign_key(source.relation)
-          return [source_key, target_key] unless block
-          yield(source_key, target_key)
-        end
       end
     end
   end

data/lib/rom/sql/commands.rb

@@ -3,6 +3,3 @@ require 'rom/commands'
 require 'rom/sql/commands/create'
 require 'rom/sql/commands/update'
 require 'rom/sql/commands/delete'
-
-require 'rom/sql/commands/postgres'
-require 'rom/sql/commands_ext/postgres'

data/lib/rom/sql/commands/error_wrapper.rb

@@ -11,7 +11,7 @@ module ROM
         def call(*args)
           super
         rescue *ERROR_MAP.keys => e
-          raise ERROR_MAP[e.class], e
+          raise ERROR_MAP.fetch(e.class, Error), e
         end
 
         alias_method :[], :call

data/lib/rom/sql/errors.rb

@@ -1,7 +1,8 @@
-require "rom/sql/error"
+require 'rom/sql/error'
 
 module ROM
   module SQL
+    MissingConfigurationError = Class.new(StandardError)
     NoAssociationError        = Class.new(StandardError)
     DatabaseError             = Class.new(Error)
     ConstraintError           = Class.new(Error)
@@ -9,9 +10,11 @@ module ROM
     UniqueConstraintError     = Class.new(ConstraintError)
     ForeignKeyConstraintError = Class.new(ConstraintError)
     CheckConstraintError      = Class.new(ConstraintError)
+    UnknownDBTypeError        = Class.new(StandardError)
 
     ERROR_MAP = {
       Sequel::DatabaseError => DatabaseError,
+      Sequel::ConstraintViolation => ConstraintError,
       Sequel::NotNullConstraintViolation => NotNullConstraintError,
       Sequel::UniqueConstraintViolation => UniqueConstraintError,
       Sequel::ForeignKeyConstraintViolation => ForeignKeyConstraintError,

data/lib/rom/sql/extensions.rb

@@ -0,0 +1,19 @@
+require 'dry/core/extensions'
+
+module ROM
+  module SQL
+    extend Dry::Core::Extensions
+
+    register_extension(:postgres) do
+      require 'rom/sql/extensions/postgres'
+    end
+
+    register_extension(:active_support_notifications) do
+      require 'rom/sql/extensions/active_support_notifications'
+    end
+
+    register_extension(:rails_log_subscriber) do
+      require 'rom/sql/extensions/rails_log_subscriber'
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+require 'rom/sql/extensions/postgres/commands'
+require 'rom/sql/extensions/postgres/types'
+require 'rom/sql/extensions/postgres/inferrer'

data/lib/rom/sql/{commands/postgres.rb → extensions/postgres/commands.rb}

@@ -1,7 +1,45 @@
+require 'rom/sql/commands/create'
+require 'rom/sql/commands/update'
+
 module ROM
   module SQL
     module Commands
       module Postgres
+        module Create
+          # Executes insert statement and returns inserted tuples
+          #
+          # @api private
+          def insert(tuples)
+            tuples.map do |tuple|
+              relation.dataset.returning(*relation.columns).insert(tuple)
+            end.flatten
+          end
+
+          # Executes multi_insert statement and returns inserted tuples
+          #
+          # @api private
+          def multi_insert(tuples)
+            relation.dataset.returning(*relation.columns).multi_insert(tuples)
+          end
+
+          # Executes upsert statement (INSERT with ON CONFLICT clause)
+          # and returns inserted/updated tuples
+          #
+          # @api private
+          def upsert(tuple, opts = EMPTY_HASH)
+            relation.dataset.returning(*relation.columns).insert_conflict(opts).insert(tuple)
+          end
+        end
+
+        module Update
+          # Executes update statement and returns updated tuples
+          #
+          # @api private
+          def update(tuple)
+            relation.dataset.returning(*relation.columns).update(tuple)
+          end
+        end
+
         # Upsert command
         #
         # Uses a feature of PostgreSQL 9.5 commonly called an "upsert".

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

@@ -0,0 +1,64 @@
+require 'rom/sql/schema/inferrer'
+require 'rom/sql/extensions/postgres/types'
+
+module ROM
+  module SQL
+    class Schema
+      class PostgresInferrer < Inferrer[:postgres]
+        defines :db_numeric_types, :db_type_mapping, :db_array_type_matcher
+
+        db_numeric_types(
+          'smallint'         => true,
+          'integer'          => true,
+          'bigint'           => true,
+          'decimal'          => true,
+          'numeric'          => true,
+          'real'             => true,
+          'double precision' => true,
+          'serial'           => true,
+          'bigserial'        => true,
+        ).freeze
+
+        db_type_mapping(
+          'uuid'  => Types::PG::UUID,
+          'money' => Types::PG::Money,
+          'bytea' => Types::Blob,
+          'json'  => Types::PG::JSON,
+          'jsonb' => Types::PG::JSONB,
+        ).freeze
+
+        db_array_type_matcher Sequel::Postgres::PGArray::EMPTY_BRACKET
+
+        private
+
+        def map_pk_type(type, db_type)
+          if numeric?(type, db_type)
+            type = self.class.numeric_pk_type
+          else
+            type = map_type(type, db_type)
+          end
+
+          type.meta(primary_key: true)
+        end
+
+        def map_type(ruby_type, db_type)
+          if db_type.end_with?(self.class.db_array_type_matcher)
+            Types::PG::Array(db_type)
+          else
+            map_db_type(db_type) || super
+          end
+        end
+
+        def map_db_type(db_type)
+          self.class.db_type_mapping[db_type]
+        end
+
+        def numeric?(ruby_type, db_type)
+          self.class.db_numeric_types.fetch(db_type) do
+            ruby_type == :integer
+          end
+        end
+      end
+    end
+  end
+end