rom-sql 1.0.0.beta2 → 1.0.0.beta3

data/spec/integration/schema/inferrer/sqlite_spec.rb

@@ -0,0 +1,36 @@
+RSpec.describe 'ROM::SQL::Schema::SqliteInferrer', :sqlite do
+  include_context 'database setup'
+
+  before do
+    conn.drop_table?(:test_inferrence)
+
+    conn.create_table :test_inferrence do
+      tinyint :tiny
+      int8 :big
+    end
+  end
+
+  after do
+    conn.drop_table?(:test_inferrence)
+  end
+
+  let(:dataset) { :test_inferrence }
+
+  let(:schema) { container.relations[dataset].schema }
+
+  before do
+    dataset = self.dataset
+    conf.relation(dataset) do
+      schema(dataset, infer: true)
+    end
+  end
+
+  it 'can infer attributes for dataset' do
+    source = container.relations[:test_inferrence].name
+
+    expect(schema.to_h).to eql(
+      tiny: ROM::SQL::Types::Int.optional.meta(name: :tiny, source: source),
+      big: ROM::SQL::Types::Int.optional.meta(name: :big, source: source),
+    )
+  end
+end

data/spec/integration/{schema_inference_spec.rb → schema/inferrer_spec.rb}

@@ -57,7 +57,6 @@ RSpec.describe 'Schema inference for common datatypes' do
             Time :time
             Date :date
             DateTime :datetime, null: false
-            BigDecimal :bigdec
 
             if ctx.sqlite?(example)
               add_constraint(:test_constraint) { char_length(text) > 3 }
@@ -83,7 +82,50 @@ RSpec.describe 'Schema inference for common datatypes' do
             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),
-            bigdec: ROM::SQL::Types::Decimal.optional.meta(name: :bigdec, source: source)
+          )
+        end
+      end
+
+      context 'numeric datatypes' do
+        before do |example|
+          ctx = self
+          conn.drop_table?(:test_numeric)
+
+          conn.create_table :test_numeric do
+            primary_key :id
+            decimal :dec, null: false
+            decimal :dec_prec, size: 12, null: false
+            numeric :num, size: [5, 2], null: false
+            smallint :small
+            integer :int
+            bigint :big
+            float :floating
+            double :double_p
+          end
+        end
+
+        let(:dataset) { :test_numeric }
+        let(:source) { ROM::Relation::Name[dataset] }
+
+        let(:decimal) { ROM::SQL::Types::Decimal.meta(source: source) }
+
+        it 'infers attributes with precision' do |example|
+          if mysql?(example)
+            default_precision = decimal.meta(name: :dec, precision: 10, scale: 0)
+          else
+            default_precision = decimal.meta(name: :dec)
+          end
+
+          expect(schema.to_h).to eql(
+            id: ROM::SQL::Types::Serial.meta(name: :id, source: source),
+            dec: default_precision,
+            dec_prec: decimal.meta(name: :dec_prec, precision: 12, scale: 0),
+            num: decimal.meta(name: :num, precision: 5, scale: 2),
+            small: ROM::SQL::Types::Int.optional.meta(name: :small, source: source),
+            int: ROM::SQL::Types::Int.optional.meta(name: :int, source: source),
+            big: ROM::SQL::Types::Int.optional.meta(name: :big, source: source),
+            floating: ROM::SQL::Types::Float.optional.meta(name: :floating, source: source),
+            double_p: ROM::SQL::Types::Float.optional.meta(name: :double_p, source: source),
           )
         end
       end
@@ -238,17 +280,4 @@ RSpec.describe 'Schema inference for common datatypes' do
       end
     end
   end
-
-  with_adapters(:postgres) do
-    context 'with a table without columns' do
-      before do
-        conn.create_table(:dummy) unless conn.table_exists?(:dummy) 
-        conf.relation(:dummy) { schema(infer: true) }
-      end
-
-      it 'does not fail with a weird error when a relation does not have attributes' do
-        expect(container.relations[:dummy].schema).to be_empty
-      end
-    end
-  end
 end

data/spec/integration/sequel_api_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+RSpec.describe 'Using legacy sequel api', :sqlite do
+  include_context 'database setup'
+
+  let(:users) { relations[:users] }
+
+  before do
+    conf.relation(:users) do
+      include ROM::SQL::Relation::SequelAPI
+    end
+
+    users.insert(name: 'Jane')
+  end
+
+  describe '#select' do
+    it 'selects columns' do
+      expect(users.select(:users__id, :users__name).first).to eql(id: 1, name: 'Jane')
+    end
+
+    it 'supports legacy blocks' do
+      expect(users.select { count(id).as(:count) }.group(:id).first).to eql(count: 1)
+    end
+  end
+
+  describe '#where' do
+    it 'restricts relation' do
+      expect(users.where(name: 'Jane').first).to eql(id: 1, name: 'Jane')
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -14,4 +14,8 @@ module Helpers
       type_class: ROM::SQL::Type
     )
   end
+
+  def define_type(name, id, **opts)
+    ROM::SQL::Type.new(ROM::Types.const_get(id).meta(name: name, **opts))
+  end
 end

data/spec/unit/function_spec.rb

@@ -0,0 +1,35 @@
+require 'rom/sql/function'
+
+RSpec.describe ROM::SQL::Function, :postgres do
+  subject(:func) { ROM::SQL::Function.new(type) }
+
+  include_context 'database setup'
+
+  let(:ds) { container.gateways[:default][:users] }
+  let(:type) { ROM::SQL::Types::Int }
+
+  describe '#sql_literal' do
+    context 'without alias' do
+      specify do
+        expect(func.count(:id).sql_literal(ds)).to eql(%(COUNT("id")))
+      end
+    end
+
+    context 'with alias' do
+      specify do
+        expect(func.count(:id).as(:count).sql_literal(ds)).to eql(%(COUNT("id") AS "count"))
+      end
+    end
+  end
+
+  describe '#method_missing' do
+    it 'responds to anything when not set' do
+      expect(func.count(:id)).to be_instance_of(func.class)
+    end
+
+    it 'raises error when is set already' do
+      expect { func.count(:id).upper.sql_literal(ds) }.
+        to raise_error(NoMethodError, /upper/)
+    end
+  end
+end

data/spec/unit/order_dsl_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+RSpec.describe ROM::SQL::OrderDSL, :postgres, helpers: true do
+  include_context 'database setup'
+
+  subject(:dsl) do
+    ROM::SQL::OrderDSL.new(schema)
+  end
+
+  let(:schema) do
+    define_schema(:users, id: ROM::SQL::Types::Serial, name: ROM::SQL::Types::String)
+  end
+
+  let(:ds) do
+    conn[:users]
+  end
+
+  describe '#call' do
+    it 'returns an array with ordered expressions' do
+      expect(dsl.call { id }.first.sql_literal(conn[:users])).to eql('"id"')
+    end
+  end
+
+  describe '#method_missing' do
+    it 'responds to methods matching attribute names' do
+      expect(dsl.id.name).to be(:id)
+      expect(dsl.name.name).to be(:name)
+    end
+
+    it 'delegates to sequel virtual row' do
+      expect(dsl.call { nullif(id.qualified, `''`).desc }.first.sql_literal(conn[:users])).
+        to eql(%(NULLIF("users"."id", '') DESC))
+    end
+  end
+end

data/spec/unit/relation/assoc_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+RSpec.describe ROM::SQL::Relation, :sqlite do
+  include_context 'users and tasks'
+
+  let(:users) { relations[:users] }
+  let(:tasks) { relations[:tasks] }
+
+  before do
+    conf.relation(:users) do
+      schema(infer: true) do
+        associations do
+          has_many :tasks
+        end
+      end
+    end
+
+    conf.relation(:tasks) do
+      schema(infer: true) do
+        associations do
+          belongs_to :users, as: :user
+        end
+      end
+    end
+  end
+
+  with_adapters(:sqlite) do
+    it 'returns child tuples for a relation' do
+      expect(users.assoc(:tasks).where(name: 'Jane').to_a).
+        to eql([{ id: 2, user_id: 1, title: "Jane's task" }])
+    end
+
+    it 'returns parent tuples for a relation' do
+      expect(tasks.assoc(:user).where(title: "Jane's task").to_a).
+        to eql([{ id: 1, task_id: 2, name: 'Jane' }])
+    end
+  end
+end

data/spec/unit/relation/inner_join_spec.rb

@@ -21,6 +21,21 @@ RSpec.describe ROM::Relation, '#inner_join' do
       ])
     end
 
+    it 'allows specifying table_aliases' do
+      relation.insert id: 3, name: 'Jade'
+
+      result = relation.
+                 inner_join(:tasks, {user_id: :id}, table_alias: :t1).
+                 select(:name, tasks[:title])
+
+      expect(result.schema.map(&:name)).to eql(%i[name title])
+
+      expect(result.to_a).to eql([
+        { name: 'Jane', title: "Jane's task" },
+        { name: 'Joe', title: "Joe's task" }
+      ])
+    end
+
     context 'with associations' do
       before do
         conf.relation(:users) do

data/spec/unit/types_spec.rb

@@ -1,6 +1,6 @@
 require 'rom/sql/types'
 
-RSpec.describe 'ROM::SQL::Types', :postgres do
+RSpec.describe ROM::SQL::Types, :postgres do
   describe 'ROM::SQL::Types::Serial' do
     it 'accepts ints > 0' do
       expect(ROM::SQL::Types::Serial[1]).to be(1)
@@ -20,4 +20,56 @@ RSpec.describe 'ROM::SQL::Types', :postgres do
       expect(output).to eql('sutin')
     end
   end
+
+  describe '#sql_literal', helpers: true do
+    subject(:base) { define_type(:age, :Int, source: ROM::Relation::Name.new(:users)) }
+
+    include_context 'database setup'
+
+    let(:ds) { container.gateways[:default][:users] }
+    let(:sql_literal) { type.sql_literal(ds) }
+
+    context 'when qualified' do
+      subject(:type) { base.qualified }
+
+      specify do
+        expect(sql_literal).to eql(%("users"."age"))
+      end
+    end
+
+    context 'when aliased' do
+      subject(:type) { base.as(:user_age) }
+
+      specify do
+        expect(sql_literal).to eql(%("age" AS "user_age"))
+      end
+    end
+
+    context 'when qualified and aliased' do
+      subject(:type) { base.qualified.as(:user_age) }
+
+      specify do
+        expect(sql_literal).to eql(%("users"."age" AS "user_age"))
+      end
+    end
+
+    context 'when aliased and qualified' do
+      subject(:type) { base.as(:user_age).qualified }
+
+      specify do
+        expect(sql_literal).to eql(%("users"."age" AS "user_age"))
+      end
+    end
+
+    context 'when qualified with a function expr' do
+      subject(:type) { base.meta(sql_expr: func).qualified }
+
+      let(:func) { Sequel::SQL::Function.new(:count, :age) }
+
+      specify do
+        expect { sql_literal }.
+          to raise_error(ROM::SQL::Type::QualifyError, "can't qualify :age (#{func.inspect})")
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -153,11 +153,15 @@ files:
 - lib/rom/sql/errors.rb
 - lib/rom/sql/extensions.rb
 - lib/rom/sql/extensions/active_support_notifications.rb
+- lib/rom/sql/extensions/mysql.rb
+- lib/rom/sql/extensions/mysql/inferrer.rb
 - lib/rom/sql/extensions/postgres.rb
 - lib/rom/sql/extensions/postgres/commands.rb
 - lib/rom/sql/extensions/postgres/inferrer.rb
 - lib/rom/sql/extensions/postgres/types.rb
 - lib/rom/sql/extensions/rails_log_subscriber.rb
+- lib/rom/sql/extensions/sqlite.rb
+- lib/rom/sql/extensions/sqlite/inferrer.rb
 - lib/rom/sql/function.rb
 - lib/rom/sql/gateway.rb
 - lib/rom/sql/migration.rb
@@ -172,6 +176,7 @@ files:
 - lib/rom/sql/rake_task.rb
 - lib/rom/sql/relation.rb
 - lib/rom/sql/relation/reading.rb
+- lib/rom/sql/relation/sequel_api.rb
 - lib/rom/sql/relation/writing.rb
 - lib/rom/sql/restriction_dsl.rb
 - lib/rom/sql/schema.rb
@@ -186,7 +191,6 @@ files:
 - lib/rom/sql/version.rb
 - log/.gitkeep
 - rom-sql.gemspec
-- spec/extensions/postgres/inferrer_spec.rb
 - spec/extensions/postgres/integration_spec.rb
 - spec/extensions/postgres/types_spec.rb
 - spec/fixtures/migrations/20150403090603_create_carrots.rb
@@ -214,11 +218,15 @@ files:
 - spec/integration/plugins/auto_wrap_spec.rb
 - spec/integration/relation_schema_spec.rb
 - spec/integration/schema/call_spec.rb
+- spec/integration/schema/inferrer/mysql_spec.rb
+- spec/integration/schema/inferrer/postgres_spec.rb
+- spec/integration/schema/inferrer/sqlite_spec.rb
+- spec/integration/schema/inferrer_spec.rb
 - spec/integration/schema/prefix_spec.rb
 - spec/integration/schema/qualified_spec.rb
 - spec/integration/schema/rename_spec.rb
 - spec/integration/schema/view_spec.rb
-- spec/integration/schema_inference_spec.rb
+- spec/integration/sequel_api_spec.rb
 - spec/integration/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
 - spec/integration/support/rails_log_subscriber_spec.rb
@@ -234,12 +242,15 @@ files:
 - spec/unit/association/one_to_many_spec.rb
 - spec/unit/association/one_to_one_spec.rb
 - spec/unit/association/one_to_one_through_spec.rb
+- spec/unit/function_spec.rb
 - spec/unit/gateway_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/migration_tasks_spec.rb
 - spec/unit/migrator_spec.rb
+- spec/unit/order_dsl_spec.rb
 - spec/unit/plugin/pagination_spec.rb
 - spec/unit/projection_dsl_spec.rb
+- spec/unit/relation/assoc_spec.rb
 - spec/unit/relation/associations_spec.rb
 - spec/unit/relation/avg_spec.rb
 - spec/unit/relation/by_pk_spec.rb
@@ -298,7 +309,6 @@ signing_key:
 specification_version: 4
 summary: SQL databases support for ROM
 test_files:
-- spec/extensions/postgres/inferrer_spec.rb
 - spec/extensions/postgres/integration_spec.rb
 - spec/extensions/postgres/types_spec.rb
 - spec/fixtures/migrations/20150403090603_create_carrots.rb
@@ -326,11 +336,15 @@ test_files:
 - spec/integration/plugins/auto_wrap_spec.rb
 - spec/integration/relation_schema_spec.rb
 - spec/integration/schema/call_spec.rb
+- spec/integration/schema/inferrer/mysql_spec.rb
+- spec/integration/schema/inferrer/postgres_spec.rb
+- spec/integration/schema/inferrer/sqlite_spec.rb
+- spec/integration/schema/inferrer_spec.rb
 - spec/integration/schema/prefix_spec.rb
 - spec/integration/schema/qualified_spec.rb
 - spec/integration/schema/rename_spec.rb
 - spec/integration/schema/view_spec.rb
-- spec/integration/schema_inference_spec.rb
+- spec/integration/sequel_api_spec.rb
 - spec/integration/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
 - spec/integration/support/rails_log_subscriber_spec.rb
@@ -346,12 +360,15 @@ test_files:
 - spec/unit/association/one_to_many_spec.rb
 - spec/unit/association/one_to_one_spec.rb
 - spec/unit/association/one_to_one_through_spec.rb
+- spec/unit/function_spec.rb
 - spec/unit/gateway_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/migration_tasks_spec.rb
 - spec/unit/migrator_spec.rb
+- spec/unit/order_dsl_spec.rb
 - spec/unit/plugin/pagination_spec.rb
 - spec/unit/projection_dsl_spec.rb
+- spec/unit/relation/assoc_spec.rb
 - spec/unit/relation/associations_spec.rb
 - spec/unit/relation/avg_spec.rb
 - spec/unit/relation/by_pk_spec.rb