rom-sql 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fdb75ab8064473be4552789976b049b939ed356
-  data.tar.gz: 3c2cc1dd4f7ee9428f6a2f45a2ecc1368c6e5882
+  metadata.gz: 7afadeffec4c6a560640ef08d8dbe333d067bf6c
+  data.tar.gz: 096577d996f4be2697da8ca271e57c60cdbdf18e
 SHA512:
-  metadata.gz: a96f739270f64f4828b7d777d949b6b20bfd7161c6a19813347d1f0fdbdbe4f125c387195ab01dc184fbac06ab3faf83cfda76e608f212937336529663fd4d87
-  data.tar.gz: af5dbaba037a0ef816b32af01ba4b2c504eaf6310463d244b38e79304b8b4face04137857b9c12f9b30c87c73cb044e369153a0e6b8322f9d5949b0ef689cc91
+  metadata.gz: 65fc494f45e9e7a76ba43aeb541d5c38719b020ae7ef5092e3e1698f53e3ddf15c23baa4fe97c3a8bd0cb646b4ebec3c0efad77bf03aaeee9317cc9bf5aea2fb
+  data.tar.gz: 493b7c1cae2cb730c092e5b30df0e866797c2fdac2a5ce0c2264cbd2cf05a86ed66521c219b8d5c4c12687425bbf3ed82e193c6f5583969a49106264a17add47

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.9.1 2016-12-23
+
+### Added
+
+* Support for PG enums in schema inferrer (flash-gordon)
+* `ROM::SQL::Relation#read` method which accepts an SQL string and returns a new relation (solnic)
+
+[Compare v0.9.0...v0.9.1](https://github.com/rom-rb/rom-sql/compare/v0.9.0...v0.9.1)
+
 ## v0.9.0 2016-11-08
 
 ### Added

data/Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rom', github: 'rom-rb/rom', branch: 'master'
-
 group :test do
   gem 'byebug', platforms: :mri
   gem 'dry-struct'

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

@@ -1,3 +1,4 @@
+require 'set'
 require 'rom/sql/schema/inferrer'
 require 'rom/sql/extensions/postgres/types'
 
@@ -7,17 +8,11 @@ module ROM
       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_numeric_types %w(
+          smallint integer bigint
+          decimal numeric real
+          double\ precision serial bigserial
+        ).to_set.freeze
 
         db_type_mapping(
           'uuid'  => Types::PG::UUID,
@@ -41,9 +36,11 @@ module ROM
           type.meta(primary_key: true)
         end
 
-        def map_type(ruby_type, db_type)
+        def map_type(ruby_type, db_type, enum_values: nil, **_)
           if db_type.end_with?(self.class.db_array_type_matcher)
             Types::PG::Array(db_type)
+          elsif enum_values
+            Types::String.enum(*enum_values)
           else
             map_db_type(db_type) || super
           end
@@ -54,9 +51,7 @@ module ROM
         end
 
         def numeric?(ruby_type, db_type)
-          self.class.db_numeric_types.fetch(db_type) do
-            ruby_type == :integer
-          end
+          self.class.db_numeric_types.include?(db_type) || ruby_type == :integer
         end
       end
     end

data/lib/rom/sql/relation/reading.rb

@@ -507,6 +507,20 @@ module ROM
         def unique?(criteria)
           where(criteria).count.zero?
         end
+
+        # Return a new relation from a raw SQL string
+        #
+        # @example
+        #   users.read('SELECT name FROM users')
+        #
+        # @param [String] sql The SQL string
+        #
+        # @return [SQL::Relation]
+        #
+        # @api public
+        def read(sql)
+          __new__(dataset.db[sql])
+        end
       end
     end
   end

data/lib/rom/sql/schema/inferrer.rb

@@ -53,7 +53,7 @@ module ROM
           if primary_key
             map_pk_type(type, db_type)
           else
-            mapped_type = map_type(type, db_type)
+            mapped_type = map_type(type, db_type, rest)
             mapped_type = mapped_type.optional if allow_null
             mapped_type = mapped_type.meta(foreign_key: true, relation: foreign_key) if foreign_key
             mapped_type
@@ -64,7 +64,7 @@ module ROM
           self.class.numeric_pk_type.meta(primary_key: true)
         end
 
-        def map_type(ruby_type, db_type)
+        def map_type(ruby_type, db_type, **_kw)
           self.class.ruby_type_mapping.fetch(ruby_type) {
             raise UnknownDBTypeError, "Cannot find corresponding type for #{ruby_type || db_type}"
           }

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '0.9.0'.freeze
+    VERSION = '0.9.1'.freeze
   end
 end

data/spec/extensions/postgres/inferrer_spec.rb

@@ -1,8 +1,15 @@
 RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
   include_context 'database setup'
 
+  colors = %w(red orange yellow green blue purple)
+
   before do
+    conn.extension :pg_enum
+
     conn.drop_table?(:test_inferrence)
+    conn.drop_enum(:rainbow, if_exists: true)
+
+    conn.create_enum(:rainbow, colors)
 
     conn.create_table :test_inferrence do
       primary_key :id, :uuid
@@ -11,6 +18,7 @@ RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
       Decimal :money, null: false
       column :tags, "text[]"
       column :tag_ids, "bigint[]"
+      rainbow :color
     end
   end
 
@@ -33,7 +41,8 @@ RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
         jsonb_data: ROM::SQL::Types::PG::JSONB.optional.meta(name: :jsonb_data),
         money: ROM::SQL::Types::Decimal.meta(name: :money),
         tags: ROM::SQL::Types::PG::Array('text').optional.meta(name: :tags),
-        tag_ids: ROM::SQL::Types::PG::Array('biging').optional.meta(name: :tag_ids)
+        tag_ids: ROM::SQL::Types::PG::Array('biging').optional.meta(name: :tag_ids),
+        color: ROM::SQL::Types::String.enum(*colors).optional.meta(name: :color)
       )
     end
   end

data/spec/unit/relation/read_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe ROM::Relation, '#read' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    let(:users) do
+      relation.read('SELECT name FROM users')
+    end
+
+    it 'returns results from raw SQL' do
+      expect(users).to match_array([{ name: 'Jane' }, { name: 'Joe' }])
+    end
+
+    it 'returns a new SQL relation' do
+      materialized = users.()
+      expect(materialized).to match_array([{ name: 'Jane' }, { name: 'Joe' }])
+      expect(materialized.source).to be(users)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -258,6 +258,7 @@ files:
 - spec/unit/relation/primary_key_spec.rb
 - spec/unit/relation/project_spec.rb
 - spec/unit/relation/qualified_columns_spec.rb
+- spec/unit/relation/read_spec.rb
 - spec/unit/relation/rename_spec.rb
 - spec/unit/relation/sum_spec.rb
 - spec/unit/relation/union_spec.rb
@@ -356,6 +357,7 @@ test_files:
 - spec/unit/relation/primary_key_spec.rb
 - spec/unit/relation/project_spec.rb
 - spec/unit/relation/qualified_columns_spec.rb
+- spec/unit/relation/read_spec.rb
 - spec/unit/relation/rename_spec.rb
 - spec/unit/relation/sum_spec.rb
 - spec/unit/relation/union_spec.rb