rom-sql 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ef8c53c46264b6203d44eaad523cda0815845e
-  data.tar.gz: c2514bbd7868d4591cd2a714e158bfafa2a36fbf
+  metadata.gz: 240c81ee43a6d5edfbf9b599d7a031196a686978
+  data.tar.gz: 6abdfcd3fdeef06cbbf0794dbb0ebbde658e043e
 SHA512:
-  metadata.gz: 1d21a1a74c17f0489431b31d648e58cb0fce934808811111f6e01fc11f4307096884fdc7c8246bc302ce41cd5ea992be9e12a48123841797d8dacab5bc2c88df
-  data.tar.gz: 5dc78196284dfeb55ac969afcb79510db21fa31bf5238f26209d8bdbe1ed919a929130313dd9600c07842b110facc88487a7c4e137642293f3f885075b210172
+  metadata.gz: cdfd38e021013963c48d176d44f7872dd737728254ad066b03a13ded7c90553fd6017651300bd169a6231841f4386e57ce8eb58275c3218b70938a13e42d56cf
+  data.tar.gz: 81459e9c88292c2c37218074ab7adf37070852455604829d95cf360bb12565aca97b6b782bbd1f88b0466b86b73421d9ce05157f008246bcd7d278092e196535

data/CHANGELOG.md

@@ -21,6 +21,7 @@ Please refer to [the upgrading guide](https://github.com/rom-rb/rom-sql/wiki/Upg
 
 * [BREAKING] `Relation#header` has been removed in favor of schemas (solnic)
 * [BREAKING] `Relation#base` has been removed as now a vanilla relation *is a base relation view* (solnic)
+* [BREAKING] Deprecated `Relation.primary_key` has been removed in favor of schema (solnic)
 * [BREAKING] Deprecated `Commands::Update#change` has been removed (solnic)
 * [BREAKING] Deprecated `Commands.validator` has been removed (solnic)
 * [BREAKING] `assoc_macros` plugin has been removed, please use associations from now (solnic)

data/lib/rom/sql/function.rb

@@ -1,22 +1,30 @@
 module ROM
   module SQL
     class Function < ROM::Schema::Type
-      def as(name)
-        meta(name: name)
+      def sql_literal(ds)
+        if name
+          func.as(name).sql_literal(ds)
+        else
+          func.sql_literal(ds)
+        end
       end
 
-      def sql_literal(ds)
-        func.as(name).sql_literal(ds)
+      def name
+        meta[:alias] || super
       end
 
       private
 
       def func
-        Sequel::SQL::Function.new(meta[:op], *meta[:args])
+        meta[:func]
       end
 
-      def method_missing(op, *args)
-        meta(op: op, args: args)
+      def method_missing(meth, *args)
+        if func && func.respond_to?(meth)
+          meta(func: func.__send__(meth, *args))
+        else
+          meta(func: Sequel::SQL::Function.new(meth.to_s.upcase, *args))
+        end
       end
     end
   end

data/lib/rom/sql/order_dsl.rb

@@ -1,5 +1,4 @@
 require 'rom/sql/dsl'
-require 'rom/sql/expression'
 
 module ROM
   module SQL
@@ -9,8 +8,7 @@ module ROM
       # @api private
       def method_missing(meth, *args, &block)
         if schema.key?(meth)
-          attr = schema[meth]
-          ::ROM::SQL::Expression.new(schema[meth])
+          schema[meth]
         else
           ::Sequel::VIRTUAL_ROW.__send__(meth, *args, &block)
         end

data/lib/rom/sql/relation.rb

@@ -8,8 +8,6 @@ require 'rom/plugins/relation/key_inference'
 require 'rom/plugins/relation/sql/auto_combine'
 require 'rom/plugins/relation/sql/auto_wrap'
 
-require 'dry/core/deprecations'
-
 module ROM
   module SQL
     # Sequel-specific relation extensions
@@ -88,23 +86,7 @@ module ROM
         names.map { |col| :"#{table}__#{col}" }
       end
 
-      # Set primary key
-      #
-      # @deprecated
-      #
-      # @api public
-      def self.primary_key(value)
-        Dry::Core::Deprecations.announce(
-          :primary_key,
-          "use schema definition to configure primary key",
-          tag: :rom
-        )
-        option :primary_key, reader: true, default: value
-      end
-
-      option :primary_key, reader: true, default: -> rel {
-        rel.schema? ? rel.schema.primary_key_name : :id
-      }
+      option :primary_key, reader: true, default: -> rel { rel.schema.primary_key_name }
 
       # Return raw column names
       #

data/lib/rom/sql/restriction_dsl.rb

@@ -1,5 +1,4 @@
 require 'rom/sql/dsl'
-require 'rom/sql/expression'
 
 module ROM
   module SQL
@@ -14,7 +13,7 @@ module ROM
       # @api private
       def method_missing(meth, *args, &block)
         if schema.key?(meth)
-          ::ROM::SQL::Expression.new(schema[meth])
+          schema[meth]
         else
           ::Sequel::VIRTUAL_ROW.__send__(meth, *args, &block)
         end

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

@@ -12,6 +12,7 @@ module ROM
         ruby_type_mapping(
           integer: Types::Int,
           string: Types::String,
+          time: Types::Time,
           date: Types::Date,
           datetime: Types::Time,
           boolean: Types::Bool,
@@ -24,6 +25,8 @@ module ROM
 
         db_registry Hash.new(self)
 
+        CONSTRAINT_DB_TYPE = 'add_constraint'.freeze
+
         def self.inherited(klass)
           super
 
@@ -42,7 +45,7 @@ module ROM
         def call(source, gateway)
           dataset = source.dataset
 
-          columns = gateway.connection.schema(dataset)
+          columns = filter_columns(gateway.connection.schema(dataset))
           fks = fks_for(gateway, dataset)
 
           inferred = columns.map do |(name, definition)|
@@ -58,6 +61,10 @@ module ROM
 
         private
 
+        def filter_columns(schema)
+          schema.reject { |(_, definition)| definition[:db_type] == CONSTRAINT_DB_TYPE }
+        end
+
         def build_type(primary_key:, db_type:, type:, allow_null:, foreign_key:, **rest)
           if primary_key
             map_pk_type(type, db_type)
@@ -77,7 +84,13 @@ module ROM
         end
 
         def map_type(ruby_type, db_type, **_kw)
-          self.class.ruby_type_mapping[ruby_type]
+          type = self.class.ruby_type_mapping[ruby_type]
+
+          if db_type.is_a?(String) && db_type.include?('numeric') || db_type.include?('decimal')
+            self.class.ruby_type_mapping[:decimal]
+          else
+            type
+          end
         end
 
         # @api private

data/lib/rom/sql/type.rb

@@ -12,6 +12,11 @@ module ROM
         meta(foreign_key: true)
       end
 
+      # @api public
+      def as(name)
+        super.meta(sql_expr: sql_expr.as(name))
+      end
+
       # Return a new type marked as qualified
       #
       # @return [SQL::Type]
@@ -64,12 +69,27 @@ module ROM
 
       # @api private
       def sql_literal(ds)
-        sql_expr.sql_literal(ds)
+        if sql_expr
+          sql_expr.sql_literal(ds)
+        else
+          Sequel[to_sym].sql_literal(ds)
+        end
       end
 
+      private
+
       # @api private
       def sql_expr
-        Sequel.expr(to_sym)
+        @sql_expr ||= (meta[:sql_expr] || Sequel[to_sym])
+      end
+
+      # @api private
+      def method_missing(meth, *args, &block)
+        if sql_expr.respond_to?(meth)
+          meta(sql_expr: sql_expr.__send__(meth, *args, &block))
+        else
+          super
+        end
       end
     end
   end

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '1.0.0.beta1'.freeze
+    VERSION = '1.0.0.beta2'.freeze
   end
 end

data/spec/integration/schema_inference_spec.rb

@@ -54,8 +54,14 @@ RSpec.describe 'Schema inference for common datatypes' do
             primary_key :id
             String :text, null: false
             Boolean :flag, null: false
+            Time :time
             Date :date
             DateTime :datetime, null: false
+            BigDecimal :bigdec
+
+            if ctx.sqlite?(example)
+              add_constraint(:test_constraint) { char_length(text) > 3 }
+            end
 
             if ctx.postgres?(example)
               Bytea :data
@@ -73,9 +79,11 @@ RSpec.describe 'Schema inference for common datatypes' do
             id: ROM::SQL::Types::Serial.meta(name: :id, source: source),
             text: ROM::SQL::Types::String.meta(name: :text, source: source),
             flag: ROM::SQL::Types::Bool.meta(name: :flag, source: source),
+            time: ROM::SQL::Types::Time.optional.meta(name: :time, source: source),
             date: ROM::SQL::Types::Date.optional.meta(name: :date, source: source),
             datetime: ROM::SQL::Types::Time.meta(name: :datetime, source: source),
-            data: ROM::SQL::Types::Blob.optional.meta(name: :data, source: source)
+            data: ROM::SQL::Types::Blob.optional.meta(name: :data, source: source),
+            bigdec: ROM::SQL::Types::Decimal.optional.meta(name: :bigdec, source: source)
           )
         end
       end

data/spec/support/helpers.rb

@@ -10,7 +10,8 @@ module Helpers
   def define_schema(name, attrs)
     ROM::SQL::Schema.define(
       name,
-      attributes: attrs.map { |key, value| ROM::SQL::Type.new(value.meta(name: key)) }
+      attributes: attrs.map { |key, value| value.meta(name: key, source: ROM::Relation::Name.new(name)) },
+      type_class: ROM::SQL::Type
     )
   end
 end

data/spec/unit/projection_dsl_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ROM::SQL::ProjectionDSL, :sqlite, helpers: true do
+RSpec.describe ROM::SQL::ProjectionDSL, :postgres, helpers: true do
   include_context 'database setup'
 
   subject(:dsl) do
@@ -8,7 +8,7 @@ RSpec.describe ROM::SQL::ProjectionDSL, :sqlite, helpers: true do
   end
 
   let(:schema) do
-    define_schema(:users, id: ROM::SQL::Types::Serial, name: ROM::SQL::Types::String)
+    define_schema(:users, id: ROM::SQL::Types::Serial, name: ROM::SQL::Types::String, meta: ROM::SQL::Types::PG::JSONB)
   end
 
   let(:ds) do
@@ -21,7 +21,47 @@ RSpec.describe ROM::SQL::ProjectionDSL, :sqlite, helpers: true do
                    .call { int::count(id).as(:count) }
                    .map { |attr| attr.sql_literal(ds) }
 
-      expect(literals).to eql(["count(`id`) AS 'count'"])
+      expect(literals).to eql([%(COUNT("id") AS "count")])
+    end
+
+    it 'supports chaining attribute db functions' do
+      literals = dsl
+                   .call { meta.pg_jsonb.get_text("name").as(:name) }
+                   .map { |attr| attr.sql_literal(ds) }
+
+      expect(literals).to eql([%{("meta" ->> 'name') AS "name"}])
+    end
+
+    it 'supports functions with args and chaining with other functions' do
+      literals = dsl
+                   .call { int::count(id.qualified).distinct }
+                   .map { |attr| attr.sql_literal(ds) }
+
+      expect(literals).to eql([%(COUNT(DISTINCT "users"."id"))])
+    end
+
+    it 'supports functions with args and chaining with other functions and an alias' do
+      literals = dsl
+                   .call { int::count(id.qualified).distinct.as(:count) }
+                   .map { |attr| attr.sql_literal(ds) }
+
+      expect(literals).to eql([%(COUNT(DISTINCT "users"."id") AS "count")])
+    end
+
+    it 'supports functions with arg being an attribute' do
+      literals = dsl
+                   .call { int::count(id).as(:count) }
+                   .map { |attr| attr.sql_literal(ds) }
+
+      expect(literals).to eql([%(COUNT("id") AS "count")])
+    end
+
+    it 'supports functions with arg being a qualified attribute' do
+      literals = dsl
+                   .call { int::count(id.qualified).as(:count) }
+                   .map { |attr| attr.sql_literal(ds) }
+
+      expect(literals).to eql([%(COUNT("users"."id") AS "count")])
     end
   end
 

data/spec/unit/restriction_dsl_spec.rb

@@ -23,8 +23,8 @@ RSpec.describe ROM::SQL::RestrictionDSL, :sqlite, helpers: true do
 
   describe '#method_missing' do
     it 'responds to methods matching attribute names' do
-      expect(dsl.id.type).to eql(schema[:id])
-      expect(dsl.name.type).to eql(schema[:name])
+      expect(dsl.id.name).to be(:id)
+      expect(dsl.name.name).to be(:name)
     end
 
     it 'delegates to sequel virtual row' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -151,7 +151,6 @@ files:
 - lib/rom/sql/dsl.rb
 - lib/rom/sql/error.rb
 - lib/rom/sql/errors.rb
-- lib/rom/sql/expression.rb
 - lib/rom/sql/extensions.rb
 - lib/rom/sql/extensions/active_support_notifications.rb
 - lib/rom/sql/extensions/postgres.rb

data/lib/rom/sql/expression.rb

@@ -1,26 +0,0 @@
-module ROM
-  module SQL
-    class Expression
-      attr_reader :expr, :type
-
-      def initialize(type, expr = type.sql_expr)
-        @type = type
-        @expr = expr
-      end
-
-      def sql_literal(ds)
-        expr.sql_literal(ds)
-      end
-
-      private
-
-      def method_missing(meth, *args, &block)
-        if type.respond_to?(meth)
-          self.class.new(type.__send__(meth, *args, &block))
-        else
-          self.class.new(type, expr.__send__(meth, *args, &block))
-        end
-      end
-    end
-  end
-end