rom-sql 1.0.1 → 1.0.2

data/spec/shared/notes.rb

@@ -0,0 +1,21 @@
+RSpec.shared_context 'notes' do
+  include_context 'database setup'
+
+  before do
+    inferrable_relations.concat %i(notes)
+  end
+
+  before do |example|
+    ctx = self
+
+    conn.create_table :notes do
+      primary_key :id
+      String :text, null: false
+      # TODO: Remove Oracle's workarounds once inferer can infer not-null timestamps
+      DateTime :created_at, null: ctx.oracle?(example)
+      DateTime :updated_at, null: ctx.oracle?(example)
+      DateTime :completed_at
+      Date :written
+    end
+  end
+end

data/spec/shared/posts.rb

@@ -0,0 +1,32 @@
+RSpec.shared_context 'posts' do
+  before do
+    inferrable_relations.concat %i(posts)
+  end
+
+  before do |example|
+    conn.create_table :posts do
+      primary_key :post_id
+      foreign_key :author_id, :users
+      String :title
+      String :body
+    end
+  end
+
+  before do |example|
+    next if example.metadata[:seeds] == false
+
+    conn[:posts].insert(
+      post_id: 1,
+      author_id: 2,
+      title: "Joe's post",
+      body: 'Joe wrote sutin'
+    )
+
+    conn[:posts].insert(
+      post_id: 2,
+      author_id: 1,
+      title: "Jane's post",
+      body: 'Jane wrote sutin'
+    )
+  end
+end

data/spec/shared/puppies.rb

@@ -0,0 +1,13 @@
+RSpec.shared_context 'puppies' do
+  before do
+    inferrable_relations.concat %i(puppies)
+  end
+
+  before do
+    conn.create_table :puppies do
+      primary_key :id
+      String :name, null: false
+      boolean :cute, null: false, default: true
+    end
+  end
+end

data/spec/shared/relations.rb

@@ -1,5 +1,5 @@
 RSpec.shared_context 'relations' do
-  include_context 'database setup'
+  include_context 'users and tasks'
 
   before do
     conf.relation(:users)

data/spec/shared/users.rb

@@ -0,0 +1,29 @@
+RSpec.shared_context 'users' do
+  include_context 'database setup'
+
+  before do
+    inferrable_relations.concat %i(users)
+  end
+
+  let(:users) { container.relations[:users] }
+
+  let(:jane_id) { 1 }
+  let(:joe_id) { 2 }
+
+  before do |example|
+    ctx = self
+
+    conn.create_table :users do
+      primary_key :id
+      String :name, null: false
+      check { char_length(name) > 2 } if ctx.postgres?(example)
+    end
+  end
+
+  before do |example|
+    next if example.metadata[:seeds] == false
+
+    conn[:users].insert name: 'Jane'
+    conn[:users].insert name: 'Joe'
+  end
+end

data/spec/shared/users_and_tasks.rb

@@ -1,28 +1,42 @@
-shared_context 'users and tasks' do
-  include_context 'database setup'
+RSpec.shared_context 'users and tasks' do
+  include_context 'users'
+
+  let(:tasks) { container.relations[:tasks] }
 
   before do
-    conn[:users].insert id: 1, name: 'Jane'
-    conn[:users].insert id: 2, name: 'Joe'
+    inferrable_relations.concat %i(tasks tags task_tags)
+  end
+
+  before do |example|
+    ctx = self
+
+    conn.create_table :tasks do
+      primary_key :id
+      foreign_key :user_id, :users
+      String :title, unique: true
+      constraint(:title_length) { char_length(title) > 1 } if ctx.postgres?(example)
+      constraint(:title_length) { length(title) > 1 }      if ctx.sqlite?(example)
+    end
+
+    conn.create_table :tags do
+      primary_key :id
+      String :name
+    end
+
+    conn.create_table :task_tags do
+      primary_key [:tag_id, :task_id]
+      Integer :tag_id
+      Integer :task_id
+    end
+  end
+
+  before do |example|
+    next if example.metadata[:seeds] == false
 
     conn[:tasks].insert id: 1, user_id: 2, title: "Joe's task"
     conn[:tasks].insert id: 2, user_id: 1, title: "Jane's task"
 
     conn[:tags].insert id: 1, name: 'important'
     conn[:task_tags].insert(tag_id: 1, task_id: 1)
-
-    conn[:posts].insert(
-      post_id: 1,
-      author_id: 2,
-      title: "Joe's post",
-      body: 'Joe wrote sutin'
-    )
-
-    conn[:posts].insert(
-      post_id: 2,
-      author_id: 1,
-      title: "Jane's post",
-      body: 'Jane wrote sutin'
-    )
   end
 end

data/spec/spec_helper.rb

@@ -21,22 +21,32 @@ rescue LoadError
 end
 
 LOGGER = Logger.new(File.open('./log/test.log', 'a'))
+ENV['TZ'] ||= 'UTC'
+
+oracle_settings = {
+  db_name: ENV.fetch('ROM_ORACLE_DATABASE', 'xe'),
+  host: ENV.fetch('ROM_ORACLE_HOST', 'localhost'),
+  port: Integer(ENV.fetch('ROM_ORACLE_PORT', '1521'))
+}
 
 if defined? JRUBY_VERSION
   DB_URIS = {
     sqlite: 'jdbc:sqlite:::memory',
     postgres: 'jdbc:postgresql://localhost/rom_sql',
-    mysql: 'jdbc:mysql://localhost/rom_sql?user=root'
+    mysql: 'jdbc:mysql://localhost/rom_sql?user=root',
+    oracle: ENV['ROM_USE_ORACLE'] ? fail('Setup Oracle for JRuby!') : nil
   }
 else
   DB_URIS = {
     sqlite: 'sqlite::memory',
     postgres: 'postgres://localhost/rom_sql',
-    mysql: 'mysql2://root@localhost/rom_sql'
+    mysql: 'mysql2://root@localhost/rom_sql',
+    oracle: "oracle://#{ oracle_settings[:host] }:#{ oracle_settings[:port] }/" \
+            "#{ oracle_settings[:db_name] }?username=rom_sql&password=rom_sql&autosequence=true"
   }
 end
 
-ADAPTERS = DB_URIS.keys
+ADAPTERS = ENV['ROM_USE_ORACLE'] ? DB_URIS.keys : DB_URIS.keys - %i(oracle)
 PG_LTE_95 = ENV.fetch('PG_LTE_95', 'true') == 'true'
 
 SPEC_ROOT = root = Pathname(__FILE__).dirname
@@ -49,9 +59,6 @@ class ROM::SQL::Schema::Inferrer
   end
 end
 
-Dir[root.join('shared/**/*')].each { |f| require f }
-Dir[root.join('support/**/*')].each { |f| require f }
-
 require 'dry/core/deprecations'
 Dry::Core::Deprecations.set_logger!(root.join('../log/deprecations.log'))
 
@@ -62,30 +69,8 @@ module Types
   include Dry::Types.module
 end
 
-module ENVHelper
-  def db?(type, example)
-    example.metadata[type]
-  end
-
-  def postgres?(example)
-    db?(:postgres, example)
-  end
-
-  def mysql?(example)
-    db?(:mysql, example)
-  end
-
-  def sqlite?(example)
-    db?(:sqlite, example)
-  end
-
-  def jruby?
-    defined? JRUBY_VERSION
-  end
-end
-
 def with_adapters(*args, &block)
-  reset_adapter = { postgres: false, mysql: false, sqlite: false }
+  reset_adapter = Hash[*ADAPTERS.flat_map { |a| [a, false] }]
   adapters = args.empty? || args[0] == :all ? ADAPTERS : args
 
   adapters.each do |adapter|
@@ -96,7 +81,6 @@ end
 RSpec.configure do |config|
   config.disable_monkey_patching!
 
-  config.include ENVHelper
 
   config.before(:suite) do
     tmp_test_dir = TMP_PATH.join('test')
@@ -113,5 +97,9 @@ RSpec.configure do |config|
     Object.send(:remove_const, :Test)
   end
 
+  Dir[root.join('shared/**/*.rb')].each { |f| require f }
+  Dir[root.join('support/**/*.rb')].each { |f| require f }
+
   config.include(Helpers, helpers: true)
+  config.include ENVHelper
 end

data/spec/support/env_helper.rb

@@ -0,0 +1,25 @@
+module ENVHelper
+  def db?(type, example)
+    example.metadata[type]
+  end
+
+  def postgres?(example)
+    db?(:postgres, example)
+  end
+
+  def mysql?(example)
+    db?(:mysql, example)
+  end
+
+  def sqlite?(example)
+    db?(:sqlite, example)
+  end
+
+  def oracle?(example)
+    db?(:oracle, example)
+  end
+
+  def jruby?
+    defined? JRUBY_VERSION
+  end
+end

data/spec/support/oracle/create_users.sql

@@ -0,0 +1,7 @@
+alter database default tablespace USERS;
+
+CREATE USER rom_sql IDENTIFIED BY rom_sql;
+
+GRANT unlimited tablespace, create session, create table, create sequence,
+create procedure, create trigger, create view, create materialized view,
+create database link, create synonym, create type, ctxapp TO rom_sql;

data/spec/support/oracle/set_sys_passwords.sql

@@ -0,0 +1,2 @@
+-- alter user sys identified by admin;
+-- alter user system identified by admin;

data/spec/unit/plugin/pagination_spec.rb

@@ -1,7 +1,7 @@
 require 'rom/sql/plugin/pagination'
 
-RSpec.describe 'Plugin / Pagination' do
-  include_context 'database setup'
+RSpec.describe 'Plugin / Pagination', seeds: false do
+  include_context 'users'
 
   with_adapters do
     before do

data/spec/unit/plugin/timestamp_spec.rb

@@ -1,7 +1,7 @@
 require 'rom/sql/plugin/timestamps'
 
 RSpec.describe 'Plugin / Timestamp' do
-  include_context 'database setup'
+  include_context 'notes'
 
   with_adapters do
     before do

data/spec/unit/projection_dsl_spec.rb

@@ -63,6 +63,14 @@ RSpec.describe ROM::SQL::ProjectionDSL, :postgres, helpers: true do
 
       expect(literals).to eql([%(COUNT("users"."id") AS "count")])
     end
+
+    it 'supports selecting literal strings' do
+      literals = dsl
+                   .call { `'event'`.as(:type) }
+                   .map { |attr| attr.sql_literal(ds) }
+
+      expect(literals).to eql([%('event' AS "type")])
+    end
   end
 
   describe '#method_missing' do

data/spec/unit/relation/group_spec.rb

@@ -6,11 +6,13 @@ RSpec.describe ROM::Relation, '#group' do
   include_context 'users and tasks'
 
   with_adapters do
-    it 'groups by provided attribute name' do
+    it 'groups by provided attribute name' do |example|
+      # Oracle doesn't support concise GROUP BY
+      group_by = oracle?(example) ? %i(id name) : %i(id)
       grouped = relation.
                   qualified.
                   left_join(:tasks, tasks[:user_id].qualified => relation[:id].qualified).
-                  group(:id)
+                  group(*group_by)
 
       expect(grouped.to_a).to eql([{ id: 1, name: 'Jane' }, { id: 2, name: 'Joe'}])
     end
@@ -19,7 +21,7 @@ RSpec.describe ROM::Relation, '#group' do
       grouped = relation.
                   qualified.
                   left_join(:tasks, tasks[:user_id].qualified => relation[:id].qualified).
-                  group { id.qualified }
+                  group { [id.qualified, name.qualified] }
 
       expect(grouped.to_a).to eql([{ id: 1, name: 'Jane' }, { id: 2, name: 'Joe'}])
     end

data/spec/unit/relation/max_spec.rb

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

data/spec/unit/relation/select_spec.rb

@@ -29,5 +29,12 @@ RSpec.describe ROM::Relation, '#select' do
     it 'supports blocks' do
       expect(relation.select { [id, title] }.schema.map(&:name)).to eql(%i[id title])
     end
+
+    it 'supports selecting literal strings' do
+      new_rel = relation.select { `'event'`.as(:type) }
+
+      expect(new_rel.schema[:type].primitive).to be(String)
+      expect(new_rel.first).to eql(type: 'event')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -120,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: SQL databases support for ROM
 email:
 - piotr.solnica@gmail.com
@@ -242,12 +256,19 @@ files:
 - spec/integration/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
 - spec/integration/support/rails_log_subscriber_spec.rb
+- spec/shared/accounts.rb
 - spec/shared/database_setup.rb
+- spec/shared/notes.rb
+- spec/shared/posts.rb
+- spec/shared/puppies.rb
 - spec/shared/relations.rb
-- spec/shared/users_and_accounts.rb
+- spec/shared/users.rb
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
+- spec/support/env_helper.rb
 - spec/support/helpers.rb
+- spec/support/oracle/create_users.sql
+- spec/support/oracle/set_sys_passwords.sql
 - spec/unit/association/many_to_many_spec.rb
 - spec/unit/association/many_to_one_spec.rb
 - spec/unit/association/name_spec.rb
@@ -320,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM
@@ -366,12 +387,19 @@ test_files:
 - spec/integration/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
 - spec/integration/support/rails_log_subscriber_spec.rb
+- spec/shared/accounts.rb
 - spec/shared/database_setup.rb
+- spec/shared/notes.rb
+- spec/shared/posts.rb
+- spec/shared/puppies.rb
 - spec/shared/relations.rb
-- spec/shared/users_and_accounts.rb
+- spec/shared/users.rb
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
+- spec/support/env_helper.rb
 - spec/support/helpers.rb
+- spec/support/oracle/create_users.sql
+- spec/support/oracle/set_sys_passwords.sql
 - spec/unit/association/many_to_many_spec.rb
 - spec/unit/association/many_to_one_spec.rb
 - spec/unit/association/name_spec.rb