rom-sql 0.8.0 → 0.9.0

data/spec/unit/relation/max_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe ROM::Relation, '#max' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    it 'delegates to dataset and return value' do
+      expect(relation.max(:id)).to eql(2)
+    end
+  end
+end

data/spec/unit/relation/min_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe ROM::Relation, '#min' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    it 'returns a min' do
+      expect(relation.min(:id)).to eql(1)
+    end
+  end
+end

data/spec/unit/relation/pluck_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe ROM::Relation, '#pluck' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    it 'returns a list of values from a specific column' do
+      expect(relation.pluck(:id)).to eql([1, 2])
+    end
+  end
+end

data/spec/unit/relation/prefix_spec.rb

@@ -0,0 +1,27 @@
+RSpec.describe ROM::Relation, '#prefix' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  before do
+    conf.relation(:users) do
+      def sorted
+        order(:id)
+      end
+    end
+  end
+
+  with_adapters do
+    it 'projects the dataset using new column names' do
+      prefixed = relation.sorted.prefix(:user)
+
+      expect(prefixed.first).to eql(user_id: 1, user_name: 'Jane')
+    end
+
+    it 'uses singularized table name as the default prefix' do
+      prefixed = relation.sorted.prefix
+
+      expect(prefixed.first).to eql(user_id: 1, user_name: 'Jane')
+    end
+  end
+end

data/spec/unit/relation/primary_key_spec.rb

@@ -0,0 +1,27 @@
+RSpec.describe ROM::Relation, '#primary_key' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    context 'with schema' do
+      it 'returns configured primary key from the schema' do
+        conf.relation(:users) do
+          schema do
+            attribute :name, ROM::SQL::Types::String.meta(primary_key: true)
+          end
+        end
+
+        expect(relation.primary_key).to be(:name)
+      end
+    end
+
+    context 'without schema' do
+      it 'returns :id by default' do
+        conf.relation(:users)
+
+        expect(relation.primary_key).to be(:id)
+      end
+    end
+  end
+end

data/spec/unit/relation/project_spec.rb

@@ -0,0 +1,22 @@
+RSpec.describe ROM::Relation, '#project' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  before do
+    conf.relation(:users) do
+      def sorted
+        order(:id)
+      end
+    end
+  end
+
+  with_adapters do
+    it 'projects the dataset using new column names' do
+      projected = relation.sorted.project(:name)
+
+      expect(projected.header).to match_array([:name])
+      expect(projected.first).to eql(name: 'Jane')
+    end
+  end
+end

data/spec/unit/relation/qualified_columns_spec.rb

@@ -0,0 +1,27 @@
+RSpec.describe ROM::Relation, '#qualified_columns' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  before do
+    conf.relation(:users) do
+      def sorted
+        order(:id)
+      end
+    end
+  end
+
+  with_adapters do
+    it 'returns qualified column names' do
+      columns = relation.sorted.prefix(:user).qualified_columns
+
+      expect(columns).to eql([:users__id___user_id, :users__name___user_name])
+    end
+
+    it 'returns projected qualified column names' do
+      columns = relation.sorted.project(:id).prefix(:user).qualified_columns
+
+      expect(columns).to eql([:users__id___user_id])
+    end
+  end
+end

data/spec/unit/relation/rename_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe ROM::Relation, '#rename' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  before do
+    conf.relation(:users) do
+      def sorted
+        order(:id)
+      end
+    end
+  end
+
+  with_adapters do
+    it 'projects the dataset using new column names' do
+      renamed = relation.sorted.rename(id: :user_id, name: :user_name)
+
+      expect(renamed.first).to eql(user_id: 1, user_name: 'Jane')
+    end
+  end
+end

data/spec/unit/relation/sum_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe ROM::Relation, '#sum' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    it 'returns a sum' do
+      expect(relation.sum(:id)).to eql(3)
+    end
+  end
+end

data/spec/unit/relation/union_spec.rb

@@ -0,0 +1,19 @@
+RSpec.describe ROM::Relation, '#union' do
+  subject(:relation) { container.relations.users }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    let(:relation1) { relation.where(id: 1).select(:id, :name) }
+    let(:relation2) { relation.where(id: 2).select(:id, :name) }
+
+    it 'unions two relations and returns a new relation' do
+      result = relation1.union(relation2)
+
+      expect(result.to_a).to match_array([
+        { id: 1, name: 'Jane' },
+        { id: 2, name: 'Joe' }
+      ])
+    end
+  end
+end

data/spec/unit/relation/unique_predicate_spec.rb

@@ -0,0 +1,18 @@
+RSpec.describe ROM::Relation, '#unique?' do
+  subject(:relation) { container.relations.tasks }
+
+  include_context 'users and tasks'
+
+  with_adapters do
+    before { relation.delete }
+
+    it 'returns true when there is only one tuple matching criteria' do
+      expect(relation.unique?(title: 'Task One')).to be(true)
+    end
+
+    it 'returns true when there are more than one tuple matching criteria' do
+      relation.insert(title: 'Task One')
+      expect(relation.unique?(title: 'Task One')).to be(false)
+    end
+  end
+end

data/spec/unit/schema_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe ROM::SQL::Schema do
+RSpec.describe ROM::SQL::Schema, :postgres do
   describe '#primary_key' do
     it 'returns primary key attributes' do
       schema = Class.new(ROM::Relation[:sql]).schema do

data/spec/unit/types_spec.rb

@@ -1,8 +1,7 @@
 require 'rom/sql/types'
-require 'rom/sql/types/pg'
 
-RSpec.describe ROM::SQL::Types do
-  describe ROM::SQL::Types::Serial 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)
     end
@@ -12,24 +11,8 @@ RSpec.describe ROM::SQL::Types do
     end
   end
 
-  describe ROM::SQL::Types::PG::JSON do
-    it 'coerces to pg json hash' do
-      input = { foo: 'bar' }
-
-      expect(ROM::SQL::Types::PG::JSON[input]).to eql(Sequel.pg_json(input))
-    end
-
-    it 'coerces to pg json array' do
-      input = [1, 2, 3]
-      output = ROM::SQL::Types::PG::JSON[input]
-
-      expect(output).to be_instance_of(Sequel::Postgres::JSONArray)
-      expect(output.to_a).to eql(input)
-    end
-  end
-
-  describe ROM::SQL::Types::PG::Bytea do
-    it 'coerses strings to Sequel::SQL::Blob' do
+  describe ROM::SQL::Types::Blob do
+    it 'coerces strings to Sequel::SQL::Blob' do
       input = 'sutin'
       output = described_class[input]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
@@ -141,12 +155,17 @@ files:
 - lib/rom/sql/commands/create.rb
 - lib/rom/sql/commands/delete.rb
 - lib/rom/sql/commands/error_wrapper.rb
-- lib/rom/sql/commands/postgres.rb
 - lib/rom/sql/commands/transaction.rb
 - lib/rom/sql/commands/update.rb
-- lib/rom/sql/commands_ext/postgres.rb
 - lib/rom/sql/error.rb
 - lib/rom/sql/errors.rb
+- lib/rom/sql/extensions.rb
+- lib/rom/sql/extensions/active_support_notifications.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/gateway.rb
 - lib/rom/sql/header.rb
 - lib/rom/sql/migration.rb
@@ -167,14 +186,14 @@ files:
 - lib/rom/sql/schema/dsl.rb
 - lib/rom/sql/schema/inferrer.rb
 - lib/rom/sql/spec/support.rb
-- lib/rom/sql/support/active_support_notifications.rb
-- lib/rom/sql/support/rails_log_subscriber.rb
 - lib/rom/sql/tasks/migration_tasks.rake
 - lib/rom/sql/types.rb
-- lib/rom/sql/types/pg.rb
 - 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
 - spec/integration/association/many_to_many_spec.rb
 - spec/integration/association/many_to_one_spec.rb
@@ -219,7 +238,30 @@ files:
 - 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/relation_spec.rb
+- spec/unit/relation/associations_spec.rb
+- spec/unit/relation/avg_spec.rb
+- spec/unit/relation/by_pk_spec.rb
+- spec/unit/relation/dataset_spec.rb
+- spec/unit/relation/distinct_spec.rb
+- spec/unit/relation/exclude_spec.rb
+- spec/unit/relation/fetch_spec.rb
+- spec/unit/relation/having_spec.rb
+- spec/unit/relation/inner_join_spec.rb
+- spec/unit/relation/inspect_spec.rb
+- spec/unit/relation/invert_spec.rb
+- spec/unit/relation/left_join_spec.rb
+- spec/unit/relation/map_spec.rb
+- spec/unit/relation/max_spec.rb
+- spec/unit/relation/min_spec.rb
+- spec/unit/relation/pluck_spec.rb
+- spec/unit/relation/prefix_spec.rb
+- spec/unit/relation/primary_key_spec.rb
+- spec/unit/relation/project_spec.rb
+- spec/unit/relation/qualified_columns_spec.rb
+- spec/unit/relation/rename_spec.rb
+- spec/unit/relation/sum_spec.rb
+- spec/unit/relation/union_spec.rb
+- spec/unit/relation/unique_predicate_spec.rb
 - spec/unit/schema_spec.rb
 - spec/unit/types_spec.rb
 homepage: http://rom-rb.org
@@ -247,6 +289,9 @@ 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
 - spec/integration/association/many_to_many_spec.rb
 - spec/integration/association/many_to_one_spec.rb
@@ -291,6 +336,29 @@ test_files:
 - 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/relation_spec.rb
+- spec/unit/relation/associations_spec.rb
+- spec/unit/relation/avg_spec.rb
+- spec/unit/relation/by_pk_spec.rb
+- spec/unit/relation/dataset_spec.rb
+- spec/unit/relation/distinct_spec.rb
+- spec/unit/relation/exclude_spec.rb
+- spec/unit/relation/fetch_spec.rb
+- spec/unit/relation/having_spec.rb
+- spec/unit/relation/inner_join_spec.rb
+- spec/unit/relation/inspect_spec.rb
+- spec/unit/relation/invert_spec.rb
+- spec/unit/relation/left_join_spec.rb
+- spec/unit/relation/map_spec.rb
+- spec/unit/relation/max_spec.rb
+- spec/unit/relation/min_spec.rb
+- spec/unit/relation/pluck_spec.rb
+- spec/unit/relation/prefix_spec.rb
+- spec/unit/relation/primary_key_spec.rb
+- spec/unit/relation/project_spec.rb
+- spec/unit/relation/qualified_columns_spec.rb
+- spec/unit/relation/rename_spec.rb
+- spec/unit/relation/sum_spec.rb
+- spec/unit/relation/union_spec.rb
+- spec/unit/relation/unique_predicate_spec.rb
 - spec/unit/schema_spec.rb
 - spec/unit/types_spec.rb

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

@@ -1,45 +0,0 @@
-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
-      end
-    end
-  end
-end