rom-sql 0.9.1 → 1.0.0.beta1

data/spec/unit/relation/left_join_spec.rb

@@ -1,16 +1,57 @@
 RSpec.describe ROM::Relation, '#left_join' do
-  subject(:relation) { container.relations.users }
+  subject(:relation) { relations[:users] }
+
+  let(:tasks) { relations[:tasks] }
 
   include_context 'users and tasks'
 
   with_adapters do
     it 'joins relations using left outer join' do
-      result = relation.left_join(:tasks, user_id: :id).select(:name, :title)
+      relation.insert id: 3, name: 'Jade'
+
+      result = relation.
+                 left_join(:tasks, user_id: :id).
+                 select(:name, tasks[:title])
+
+      expect(result.schema.map(&:name)).to eql(%i[name title])
 
       expect(result.to_a).to match_array([
         { name: 'Joe', title: "Joe's task" },
-        { name: 'Jane', title: "Jane's task" }
+        { name: 'Jane', title: "Jane's task" },
+        { name: 'Jade', title: nil }
       ])
     end
+
+    context 'with associations' do
+      before do
+        conf.relation(:users) do
+          schema(infer: true) do
+            associations { has_many :tasks }
+          end
+        end
+
+        conf.relation(:tasks) do
+          schema(infer: true) do
+            associations { belongs_to :user }
+          end
+        end
+
+        relation.insert id: 3, name: 'Jade'
+      end
+
+      it 'joins relation with join keys inferred' do
+        result = relation.
+                   left_join(tasks).
+                   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" },
+                                     { name: 'Jade', title: nil }
+                                   ])
+      end
+    end
   end
 end

data/spec/unit/relation/order_spec.rb

@@ -0,0 +1,40 @@
+RSpec.describe ROM::Relation, '#order' do
+  subject(:relation) { relations[:users] }
+
+  include_context 'users and tasks'
+
+  before do
+    relation.insert(id: 3, name: 'Jade')
+  end
+
+  with_adapters do
+    it 'orders by provided attribute names' do
+      ordered = relation.order(:name, :id)
+
+      expect(ordered.to_a).
+        to eql([{ id: 3, name: 'Jade' }, { id: 1, name: 'Jane' }, { id: 2, name: 'Joe' }])
+    end
+
+    it 'orders by provided attribute using a block' do
+      ordered = relation.
+                  qualified.
+                  select(:id, :name).
+                  left_join(:tasks, user_id: :id).
+                  order { name.qualified.desc }
+
+      expect(ordered.to_a).
+        to eql([{ id: 2, name: 'Joe' }, { id: 1, name: 'Jane' }, { id: 3, name: 'Jade' }])
+    end
+
+    it 'orders by provided attributes using a block' do
+      ordered = relation.
+                  qualified.
+                  select(:id, :name).
+                  left_join(:tasks, user_id: :id).
+                  order { [name.qualified.desc, id.qualified.desc] }
+
+      expect(ordered.to_a).
+        to eql([{ id: 2, name: 'Joe' }, { id: 1, name: 'Jane' }, { id: 3, name: 'Jade' }])
+    end
+  end
+end

data/spec/unit/relation/prefix_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe ROM::Relation, '#prefix' do
 
   before do
     conf.relation(:users) do
+      schema(infer: true)
+
       def sorted
         order(:id)
       end

data/spec/unit/relation/project_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe ROM::Relation, '#project' do
 
   before do
     conf.relation(:users) do
+      schema(infer: true)
+
       def sorted
         order(:id)
       end
@@ -15,7 +17,7 @@ RSpec.describe ROM::Relation, '#project' do
     it 'projects the dataset using new column names' do
       projected = relation.sorted.project(:name)
 
-      expect(projected.header).to match_array([:name])
+      expect(projected.schema.map(&:to_sym)).to match_array([:name])
       expect(projected.first).to eql(name: 'Jane')
     end
   end

data/spec/unit/relation/qualified_columns_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe ROM::Relation, '#qualified_columns' do
 
   before do
     conf.relation(:users) do
+      schema(infer: true)
+
       def sorted
         order(:id)
       end

data/spec/unit/relation/rename_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe ROM::Relation, '#rename' do
 
   before do
     conf.relation(:users) do
+      schema(infer: true)
+
       def sorted
         order(:id)
       end

data/spec/unit/relation/right_join_spec.rb

@@ -0,0 +1,59 @@
+RSpec.describe ROM::Relation, '#right_join' do
+  subject(:relation) { relations[:tasks] }
+
+  let(:users) { relations[:users] }
+
+  include_context 'users and tasks'
+
+  with_adapters :postgres, :mysql do
+    it 'joins relations using left outer join' do
+      users.insert id: 3, name: 'Jade'
+      relation.insert id: 3, title: 'Unassigned'
+
+      result = relation.
+                 right_join(:users, id: :user_id).
+                 select(:title, users[:name])
+
+      expect(result.schema.map(&:name)).to eql(%i[title name])
+
+      expect(result.to_a).to match_array([
+        { name: 'Joe', title: "Joe's task" },
+        { name: 'Jane', title: "Jane's task" },
+        { name: 'Jade', title: nil }
+      ])
+    end
+
+    context 'with associations' do
+      before do
+        conf.relation(:users) do
+          schema(infer: true) do
+            associations { has_many :tasks }
+          end
+        end
+
+        conf.relation(:tasks) do
+          schema(infer: true) do
+            associations { belongs_to :user }
+          end
+        end
+      end
+
+      it 'joins relation with join keys inferred' do
+        users.insert id: 3, name: 'Jade'
+        relation.insert id: 3, title: 'Unassigned'
+
+        result = relation.
+                   right_join(users).
+                   select(:title, users[:name])
+
+        expect(result.schema.map(&:name)).to eql(%i[title name])
+
+        expect(result.to_a).to match_array([
+                                             { name: 'Joe', title: "Joe's task" },
+                                             { name: 'Jane', title: "Jane's task" },
+                                             { name: 'Jade', title: nil }
+                                           ])
+      end
+    end
+  end
+end

data/spec/unit/relation/select_append_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe ROM::Relation, '#select_append' do
+  subject(:relation) { relations[:tasks] }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    it 'appends new columns' do
+      selected = relation.select(:id).select_append(:title)
+
+      expect(selected.schema.map(&:name)).to eql(%i[id title])
+      expect(selected.first).to eql(id: 1, title: "Joe's task")
+    end
+
+    it 'supports blocks' do
+      selected = relation.select(:id).select_append { string::upper(title).as(:title) }
+
+      expect(selected.schema.map(&:name)).to eql(%i[id title])
+      expect(selected.first).to eql(id: 1, title: "JOE'S TASK")
+    end
+  end
+end

data/spec/unit/relation/select_spec.rb

@@ -0,0 +1,41 @@
+RSpec.describe ROM::Relation, '#select' do
+  subject(:relation) { container.relations.tasks }
+
+  include_context 'users and tasks'
+
+  before do
+    conf.relation(:tasks) { schema(infer: true) }
+  end
+
+  with_adapters do
+    it 'projects a relation using a list of symbols' do
+      expect(relation.select(:id, :title).to_a)
+        .to eql([{ id: 1, title: "Joe's task" }, { id: 2, title: "Jane's task"}])
+    end
+
+    it 'projects a relation using a schema' do
+      expect(relation.select(*relation.schema.project(:id, :title)).to_a)
+        .to eql([{ id: 1, title: "Joe's task" }, { id: 2, title: "Jane's task"}])
+    end
+
+    it 'maintains schema' do
+      expect(relation.select(:id, :title).schema.map(&:name)).to eql(%i[id title])
+    end
+
+    it 'supports args and blocks' do
+      expect(relation.select(:id) { [title] }.schema.map(&:name)).to eql(%i[id title])
+    end
+
+    it 'supports blocks' do
+      expect(relation.select { [id, title] }.schema.map(&:name)).to eql(%i[id title])
+    end
+
+    it 'supports blocks with custom expressions' do
+      selected = relation
+                   .select { [int::count(id).as(:id_count), title.prefixed(:task)] }
+                   .group { [id, title] }
+
+      expect(selected.first).to eql(id_count: 1, task_title: "Joe's task")
+    end
+  end
+end

data/spec/unit/relation/where_spec.rb

@@ -0,0 +1,28 @@
+RSpec.describe ROM::Relation, '#where' do
+  subject(:relation) { relations[:tasks].select(:id, :title) }
+
+  include_context 'users and tasks'
+
+  before do
+    conf.relation(:tasks) { schema(infer: true) }
+  end
+
+  with_adapters do
+    it 'restricts relation using provided conditions' do
+      expect(relation.where(id: 1).to_a).
+        to eql([{ id: 1, title: "Joe's task" }])
+    end
+
+    it 'restricts relation using provided conditions and block' do
+      expect(relation.where(id: 1) { title.like("%Jane%") }.to_a).to be_empty
+    end
+
+    it 'restricts relation using provided conditions in a block' do
+      expect(relation.where { (id > 2) & title.like("%Jane%") }.to_a).to be_empty
+    end
+
+    it 'restricts relation using canonical attributes' do
+      expect(relation.rename(id: :user_id).where { id > 3 }.to_a).to be_empty
+    end
+  end
+end

data/spec/unit/restriction_dsl_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+RSpec.describe ROM::SQL::RestrictionDSL, :sqlite, helpers: true do
+  include_context 'database setup'
+
+  subject(:dsl) do
+    ROM::SQL::RestrictionDSL.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 'evaluates the block and returns an SQL expression' do
+      expect(dsl.call { count(id) >= 3 }.sql_literal(conn[:users])).to eql('(count(`id`) >= 3)')
+    end
+  end
+
+  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])
+    end
+
+    it 'delegates to sequel virtual row' do
+      expect(dsl.count(dsl.id).sql_literal(conn[:users])).to eql('count(`id`)')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.25'
+        version: '4.42'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.25'
+        version: '4.42'
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,34 +69,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rom
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: rom-support
+  name: rom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.beta
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +134,6 @@ files:
 - lib/rom-sql.rb
 - lib/rom/plugins/relation/sql/auto_combine.rb
 - lib/rom/plugins/relation/sql/auto_wrap.rb
-- lib/rom/plugins/relation/sql/base_view.rb
 - lib/rom/sql.rb
 - lib/rom/sql/association.rb
 - lib/rom/sql/association/many_to_many.rb
@@ -157,8 +148,10 @@ files:
 - lib/rom/sql/commands/error_wrapper.rb
 - lib/rom/sql/commands/transaction.rb
 - lib/rom/sql/commands/update.rb
+- 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
@@ -166,27 +159,30 @@ files:
 - 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/function.rb
 - lib/rom/sql/gateway.rb
-- lib/rom/sql/header.rb
 - lib/rom/sql/migration.rb
 - lib/rom/sql/migration/migrator.rb
 - lib/rom/sql/migration/template.rb
-- lib/rom/sql/plugin/assoc_macros.rb
-- lib/rom/sql/plugin/assoc_macros/class_interface.rb
+- lib/rom/sql/order_dsl.rb
 - lib/rom/sql/plugin/associates.rb
 - lib/rom/sql/plugin/pagination.rb
 - lib/rom/sql/plugins.rb
+- lib/rom/sql/projection_dsl.rb
 - lib/rom/sql/qualified_attribute.rb
 - lib/rom/sql/rake_task.rb
 - lib/rom/sql/relation.rb
 - lib/rom/sql/relation/reading.rb
 - lib/rom/sql/relation/writing.rb
+- lib/rom/sql/restriction_dsl.rb
 - lib/rom/sql/schema.rb
 - lib/rom/sql/schema/associations_dsl.rb
 - lib/rom/sql/schema/dsl.rb
 - lib/rom/sql/schema/inferrer.rb
 - lib/rom/sql/spec/support.rb
 - lib/rom/sql/tasks/migration_tasks.rake
+- lib/rom/sql/transaction.rb
+- lib/rom/sql/type.rb
 - lib/rom/sql/types.rb
 - lib/rom/sql/version.rb
 - log/.gitkeep
@@ -195,8 +191,16 @@ files:
 - spec/extensions/postgres/integration_spec.rb
 - spec/extensions/postgres/types_spec.rb
 - spec/fixtures/migrations/20150403090603_create_carrots.rb
+- spec/integration/association/many_to_many/custom_fks_spec.rb
+- spec/integration/association/many_to_many/from_view_spec.rb
 - spec/integration/association/many_to_many_spec.rb
+- spec/integration/association/many_to_one/custom_fks_spec.rb
+- spec/integration/association/many_to_one/from_view_spec.rb
+- spec/integration/association/many_to_one/self_ref_spec.rb
 - spec/integration/association/many_to_one_spec.rb
+- spec/integration/association/one_to_many/custom_fks_spec.rb
+- spec/integration/association/one_to_many/from_view_spec.rb
+- spec/integration/association/one_to_many/self_ref_spec.rb
 - spec/integration/association/one_to_many_spec.rb
 - spec/integration/association/one_to_one_spec.rb
 - spec/integration/association/one_to_one_through_spec.rb
@@ -209,8 +213,12 @@ files:
 - spec/integration/migration_spec.rb
 - spec/integration/plugins/associates_spec.rb
 - spec/integration/plugins/auto_wrap_spec.rb
-- spec/integration/read_spec.rb
 - spec/integration/relation_schema_spec.rb
+- spec/integration/schema/call_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/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
@@ -227,17 +235,12 @@ 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/association_errors_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/plugin/assoc_macros/combined_associations_spec.rb
-- spec/unit/plugin/assoc_macros/many_to_many_spec.rb
-- spec/unit/plugin/assoc_macros/many_to_one_spec.rb
-- spec/unit/plugin/assoc_macros/one_to_many_spec.rb
-- spec/unit/plugin/base_view_spec.rb
 - spec/unit/plugin/pagination_spec.rb
+- spec/unit/projection_dsl_spec.rb
 - spec/unit/relation/associations_spec.rb
 - spec/unit/relation/avg_spec.rb
 - spec/unit/relation/by_pk_spec.rb
@@ -253,6 +256,7 @@ files:
 - spec/unit/relation/map_spec.rb
 - spec/unit/relation/max_spec.rb
 - spec/unit/relation/min_spec.rb
+- spec/unit/relation/order_spec.rb
 - spec/unit/relation/pluck_spec.rb
 - spec/unit/relation/prefix_spec.rb
 - spec/unit/relation/primary_key_spec.rb
@@ -260,9 +264,14 @@ files:
 - spec/unit/relation/qualified_columns_spec.rb
 - spec/unit/relation/read_spec.rb
 - spec/unit/relation/rename_spec.rb
+- spec/unit/relation/right_join_spec.rb
+- spec/unit/relation/select_append_spec.rb
+- spec/unit/relation/select_spec.rb
 - spec/unit/relation/sum_spec.rb
 - spec/unit/relation/union_spec.rb
 - spec/unit/relation/unique_predicate_spec.rb
+- spec/unit/relation/where_spec.rb
+- spec/unit/restriction_dsl_spec.rb
 - spec/unit/schema_spec.rb
 - spec/unit/types_spec.rb
 homepage: http://rom-rb.org
@@ -280,9 +289,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -294,8 +303,16 @@ test_files:
 - spec/extensions/postgres/integration_spec.rb
 - spec/extensions/postgres/types_spec.rb
 - spec/fixtures/migrations/20150403090603_create_carrots.rb
+- spec/integration/association/many_to_many/custom_fks_spec.rb
+- spec/integration/association/many_to_many/from_view_spec.rb
 - spec/integration/association/many_to_many_spec.rb
+- spec/integration/association/many_to_one/custom_fks_spec.rb
+- spec/integration/association/many_to_one/from_view_spec.rb
+- spec/integration/association/many_to_one/self_ref_spec.rb
 - spec/integration/association/many_to_one_spec.rb
+- spec/integration/association/one_to_many/custom_fks_spec.rb
+- spec/integration/association/one_to_many/from_view_spec.rb
+- spec/integration/association/one_to_many/self_ref_spec.rb
 - spec/integration/association/one_to_many_spec.rb
 - spec/integration/association/one_to_one_spec.rb
 - spec/integration/association/one_to_one_through_spec.rb
@@ -308,8 +325,12 @@ test_files:
 - spec/integration/migration_spec.rb
 - spec/integration/plugins/associates_spec.rb
 - spec/integration/plugins/auto_wrap_spec.rb
-- spec/integration/read_spec.rb
 - spec/integration/relation_schema_spec.rb
+- spec/integration/schema/call_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/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
@@ -326,17 +347,12 @@ 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/association_errors_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/plugin/assoc_macros/combined_associations_spec.rb
-- spec/unit/plugin/assoc_macros/many_to_many_spec.rb
-- spec/unit/plugin/assoc_macros/many_to_one_spec.rb
-- spec/unit/plugin/assoc_macros/one_to_many_spec.rb
-- spec/unit/plugin/base_view_spec.rb
 - spec/unit/plugin/pagination_spec.rb
+- spec/unit/projection_dsl_spec.rb
 - spec/unit/relation/associations_spec.rb
 - spec/unit/relation/avg_spec.rb
 - spec/unit/relation/by_pk_spec.rb
@@ -352,6 +368,7 @@ test_files:
 - spec/unit/relation/map_spec.rb
 - spec/unit/relation/max_spec.rb
 - spec/unit/relation/min_spec.rb
+- spec/unit/relation/order_spec.rb
 - spec/unit/relation/pluck_spec.rb
 - spec/unit/relation/prefix_spec.rb
 - spec/unit/relation/primary_key_spec.rb
@@ -359,8 +376,13 @@ test_files:
 - spec/unit/relation/qualified_columns_spec.rb
 - spec/unit/relation/read_spec.rb
 - spec/unit/relation/rename_spec.rb
+- spec/unit/relation/right_join_spec.rb
+- spec/unit/relation/select_append_spec.rb
+- spec/unit/relation/select_spec.rb
 - spec/unit/relation/sum_spec.rb
 - spec/unit/relation/union_spec.rb
 - spec/unit/relation/unique_predicate_spec.rb
+- spec/unit/relation/where_spec.rb
+- spec/unit/restriction_dsl_spec.rb
 - spec/unit/schema_spec.rb
 - spec/unit/types_spec.rb