rom-sql 1.0.1 → 1.0.2

data/spec/integration/commands/update_spec.rb

@@ -1,7 +1,7 @@
 require 'dry-struct'
 
-RSpec.describe 'Commands / Update' do
-  include_context 'database setup'
+RSpec.describe 'Commands / Update', seeds: false do
+  include_context 'users'
 
   subject(:users) { container.command(:users) }
 
@@ -73,7 +73,7 @@ RSpec.describe 'Commands / Update' do
 
         expect {
           users.update.by_id(piotr[:id]).call(name: nil)
-        }.to raise_error(ROM::SQL::NotNullConstraintError, /name/)
+        }.to raise_error(ROM::SQL::NotNullConstraintError, /name/i)
       end
 
       it 'materializes single result' do

data/spec/integration/commands/upsert_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'Commands / Postgres / Upsert', :postgres do
+RSpec.describe 'Commands / Postgres / Upsert', :postgres, seeds: false do
   subject(:command) { commands[:tasks][:create_or_update] }
 
   include_context 'relations'

data/spec/integration/gateway_spec.rb

@@ -1,19 +1,17 @@
-RSpec.describe ROM::SQL::Gateway, :postgres, skip_tables: true do
+RSpec.describe ROM::SQL::Gateway, :postgres do
   include_context 'database setup'
 
   describe 'migration' do
+    before do
+      inferrable_relations.concat %i(rabbits carrots)
+    end
+
     context 'creating migrations inline' do
       subject(:gateway) { container.gateways[:default] }
 
       let(:conf) { ROM::Configuration.new(:sql, conn) }
       let(:container) { ROM.container(conf) }
 
-      after do
-        [:rabbits, :carrots].each do |name|
-          gateway.connection.drop_table?(name)
-        end
-      end
-
       it 'allows creating and running migrations' do
         migration = gateway.migration do
           up do
@@ -39,6 +37,10 @@ RSpec.describe ROM::SQL::Gateway, :postgres, skip_tables: true do
     end
 
     context 'running migrations from a file system' do
+      before do
+        inferrable_relations.concat %i(schema_migrations)
+      end
+
       let(:migration_dir) do
         Pathname(__FILE__).dirname.join('../fixtures/migrations').realpath
       end
@@ -64,8 +66,10 @@ RSpec.describe ROM::SQL::Gateway, :postgres, skip_tables: true do
 
   describe 'transactions' do
     before do
-      conn.drop_table?(:names)
+      inferrable_relations.concat %i(names)
+    end
 
+    before do
       conn.create_table(:names) do
         String :name
       end

data/spec/integration/migration_spec.rb

@@ -1,11 +1,12 @@
-RSpec.describe ROM::SQL, '.migration', :postgres, skip_tables: true do
+RSpec.describe ROM::SQL, '.migration', :postgres do
   include_context 'database setup'
 
   before do
-    conf
-    conn.drop_table?(:dragons)
+    inferrable_relations.concat %i(dragons schema_migrations)
   end
 
+  before { conf }
+
   it 'creates a migration for a specific gateway' do
     migration = ROM::SQL.migration do
       change do

data/spec/integration/plugins/associates/many_to_many_spec.rb

@@ -1,5 +1,5 @@
-RSpec.describe 'Plugins / :associates / with many-to-many', :sqlite do
-  include_context 'database setup'
+RSpec.describe 'Plugins / :associates / with many-to-many', :sqlite, seeds: false do
+  include_context 'users and tasks'
 
   let(:tasks) { container.commands[:tasks] }
   let(:tags) { container.commands[:tags] }

data/spec/integration/plugins/associates_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'Plugins / :associates' do
+RSpec.describe 'Plugins / :associates', seeds: false do
   include_context 'relations'
 
   with_adapters do

data/spec/integration/relation_schema_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe 'Inferring schema from database' do
-  include_context 'database setup'
+  include_context 'users'
+  include_context 'posts'
 
   with_adapters do
     context "when database schema exists" do
@@ -13,13 +14,11 @@ RSpec.describe 'Inferring schema from database' do
 
     context "for empty database schemas" do
       it "returns an empty schema" do
-        drop_tables
-
-        expect { container.not_here }.to raise_error(NoMethodError)
+        expect { container.users }.to raise_error(NoMethodError)
       end
     end
 
-    context 'defining associations' do
+    context 'defining associations', seeds: false do
       it "allows defining a one-to-many" do
         class Test::Posts < ROM::Relation[:sql]
           schema(:posts) do

data/spec/integration/schema/call_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe ROM::SQL::Schema, '#call' do
-  include_context 'database setup'
+  include_context 'users'
 
   with_adapters :postgres do
     before do

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

@@ -2,45 +2,44 @@ RSpec.describe 'ROM::SQL::Schema::MysqlInferrer', :mysql do
   include_context 'database setup'
 
   before do
-    conn.drop_table?(:test_inferrence)
+    inferrable_relations.concat %i(test_inferrence)
+  end
 
+  before do
     conn.create_table :test_inferrence do
       tinyint :tiny
       mediumint :medium
+      bigint :big
       datetime :created_at
       column :date_and_time, 'datetime(0)'
       column :time_with_ms, 'datetime(3)'
       timestamp :unix_time_usec
       column :unix_time_sec, 'timestamp(0) null'
+      boolean :flag, null: false
     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)
+    conf.relation(:test_inferrence) do
+      schema(infer: true)
     end
   end
 
-  it 'can infer attributes for dataset' do
-    source = container.relations[:test_inferrence].name
+  let(:schema) { container.relations[:test_inferrence].schema }
+  let(:source) { container.relations[:test_inferrence].name }
 
-    expect(schema.to_h).to eql(
-      tiny: ROM::SQL::Types::Int.optional.meta(name: :tiny, source: source),
-      medium: ROM::SQL::Types::Int.optional.meta(name: :medium, source: source),
-      created_at: ROM::SQL::Types::Time.optional.meta(name: :created_at, source: source),
-      date_and_time: ROM::SQL::Types::Time.optional.meta(name: :date_and_time, source: source),
-      time_with_ms: ROM::SQL::Types::Time.optional.meta(name: :time_with_ms, source: source),
-      unix_time_usec: ROM::SQL::Types::Time.meta(name: :unix_time_usec, source: source),
-      unix_time_sec: ROM::SQL::Types::Time.optional.meta(name: :unix_time_sec, source: source)
-    )
+  it 'can infer attributes for dataset' do
+    expect(schema.to_h).
+      to eql(
+           tiny: ROM::SQL::Types::Int.optional.meta(name: :tiny, source: source),
+           medium: ROM::SQL::Types::Int.optional.meta(name: :medium, source: source),
+           big: ROM::SQL::Types::Int.optional.meta(name: :big, source: source),
+           created_at: ROM::SQL::Types::Time.optional.meta(name: :created_at, source: source),
+           date_and_time: ROM::SQL::Types::Time.optional.meta(name: :date_and_time, source: source),
+           time_with_ms: ROM::SQL::Types::Time.optional.meta(name: :time_with_ms, source: source),
+           unix_time_usec: ROM::SQL::Types::Time.meta(name: :unix_time_usec, source: source),
+           unix_time_sec: ROM::SQL::Types::Time.optional.meta(name: :unix_time_sec, source: source),
+           flag: ROM::SQL::Types::Bool.meta(name: :flag, source: source)
+         )
   end
 end

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

@@ -1,6 +1,10 @@
 RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
   include_context 'database setup'
 
+  before do
+    inferrable_relations.concat %i(test_inferrence)
+  end
+
   colors = %w(red orange yellow green blue purple)
 
   before do
@@ -14,6 +18,7 @@ RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
 
     conn.create_table :test_inferrence do
       primary_key :id, :uuid
+      bigint :big
       Json :json_data
       Jsonb :jsonb_data
       Decimal :money, null: false
@@ -35,92 +40,88 @@ RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
       timestamp :created_at
       column :datetime, "timestamp(0) without time zone"
       column :datetime_tz, "timestamp(0) with time zone"
+      boolean :flag, null: false
     end
   end
 
-  after do
-    conn.drop_table?(:test_inferrence)
-  end
-
-  let(:dataset) { :test_inferrence }
-
-  let(:schema) { container.relations[dataset].schema }
+  let(:schema) { container.relations[:test_inferrence].schema }
+  let(:source) { container.relations[:test_inferrence].name }
 
   context 'inferring db-specific attributes' do
     before do
-      dataset = self.dataset
-      conf.relation(dataset) do
-        schema(dataset, infer: true)
+      conf.relation(:test_inferrence) do
+        schema(infer: true)
       end
     end
 
     it 'can infer attributes for dataset' do
-      source = container.relations[:test_inferrence].name
-
-      expect(schema.to_h).to eql(
-        id: ROM::SQL::Types::PG::UUID.meta(name: :id, source: source, primary_key: true),
-        json_data: ROM::SQL::Types::PG::JSON.optional.meta(name: :json_data, source: source),
-        jsonb_data: ROM::SQL::Types::PG::JSONB.optional.meta(name: :jsonb_data, source: source),
-        money: ROM::SQL::Types::Decimal.meta(name: :money, source: source),
-        tags: ROM::SQL::Types::PG::Array('text').optional.meta(name: :tags, source: source),
-        tag_ids: ROM::SQL::Types::PG::Array('biging').optional.meta(name: :tag_ids, source: source),
-        color: ROM::SQL::Types::String.enum(*colors).optional.meta(name: :color, source: source),
-        ip: ROM::SQL::Types::PG::IPAddress.optional.meta(
-          name: :ip,
-          source: source,
-          read: ROM::SQL::Types::PG::IPAddressR.optional
-        ),
-        subnet: ROM::SQL::Types::PG::IPAddress.optional.meta(
-          name: :subnet,
-          source: source,
-          read: ROM::SQL::Types::PG::IPAddressR.optional
-        ),
-        hw_address: ROM::SQL::Types::String.optional.meta(name: :hw_address, source: source),
-        center: ROM::SQL::Types::PG::PointT.optional.meta(
-          name: :center,
-          source: source,
-          read: ROM::SQL::Types::PG::PointTR.optional
-        ),
-        page: ROM::SQL::Types::String.optional.meta(name: :page, source: source),
-        mapping: ROM::SQL::Types::PG::HStore.optional.meta(
-          name: :mapping,
-          source: source,
-          read: ROM::SQL::Types::PG::HStoreR.optional
-        ),
-        line: ROM::SQL::Types::PG::LineT.optional.meta(
-          name: :line,
-          source: source,
-          read: ROM::SQL::Types::PG::LineTR.optional
-        ),
-        circle: ROM::SQL::Types::PG::CircleT.optional.meta(
-          name: :circle,
-          source: source,
-          read: ROM::SQL::Types::PG::CircleTR.optional
-        ),
-        box: ROM::SQL::Types::PG::BoxT.optional.meta(
-          name: :box,
-          source: source,
-          read: ROM::SQL::Types::PG::BoxTR.optional
-        ),
-        lseg: ROM::SQL::Types::PG::LineSegmentT.optional.meta(
-          name: :lseg,
-          source: source,
-          read: ROM::SQL::Types::PG::LineSegmentTR.optional
-        ),
-        polygon: ROM::SQL::Types::PG::PolygonT.optional.meta(
-          name: :polygon,
-          source: source,
-          read: ROM::SQL::Types::PG::PolygonTR.optional
-        ),
-        path: ROM::SQL::Types::PG::PathT.optional.meta(
-          name: :path,
-          source: source,
-          read: ROM::SQL::Types::PG::PathTR.optional
-        ),
-        created_at: ROM::SQL::Types::Time.optional.meta(name: :created_at, source: source),
-        datetime: ROM::SQL::Types::Time.optional.meta(name: :datetime, source: source),
-        datetime_tz: ROM::SQL::Types::Time.optional.meta(name: :datetime_tz, source: source)
-      )
+      expect(schema.to_h).
+        to eql(
+             id: ROM::SQL::Types::PG::UUID.meta(name: :id, source: source, primary_key: true),
+             big: ROM::SQL::Types::Int.optional.meta(name: :big, source: source),
+             json_data: ROM::SQL::Types::PG::JSON.optional.meta(name: :json_data, source: source),
+             jsonb_data: ROM::SQL::Types::PG::JSONB.optional.meta(name: :jsonb_data, source: source),
+             money: ROM::SQL::Types::Decimal.meta(name: :money, source: source),
+             tags: ROM::SQL::Types::PG::Array('text').optional.meta(name: :tags, source: source),
+             tag_ids: ROM::SQL::Types::PG::Array('biging').optional.meta(name: :tag_ids, source: source),
+             color: ROM::SQL::Types::String.enum(*colors).optional.meta(name: :color, source: source),
+             ip: ROM::SQL::Types::PG::IPAddress.optional.meta(
+               name: :ip,
+               source: source,
+               read: ROM::SQL::Types::PG::IPAddressR.optional
+             ),
+             subnet: ROM::SQL::Types::PG::IPAddress.optional.meta(
+               name: :subnet,
+               source: source,
+               read: ROM::SQL::Types::PG::IPAddressR.optional
+             ),
+             hw_address: ROM::SQL::Types::String.optional.meta(name: :hw_address, source: source),
+             center: ROM::SQL::Types::PG::PointT.optional.meta(
+               name: :center,
+               source: source,
+               read: ROM::SQL::Types::PG::PointTR.optional
+             ),
+             page: ROM::SQL::Types::String.optional.meta(name: :page, source: source),
+             mapping: ROM::SQL::Types::PG::HStore.optional.meta(
+               name: :mapping,
+               source: source,
+               read: ROM::SQL::Types::PG::HStoreR.optional
+             ),
+             line: ROM::SQL::Types::PG::LineT.optional.meta(
+               name: :line,
+               source: source,
+               read: ROM::SQL::Types::PG::LineTR.optional
+             ),
+             circle: ROM::SQL::Types::PG::CircleT.optional.meta(
+               name: :circle,
+               source: source,
+               read: ROM::SQL::Types::PG::CircleTR.optional
+             ),
+             box: ROM::SQL::Types::PG::BoxT.optional.meta(
+               name: :box,
+               source: source,
+               read: ROM::SQL::Types::PG::BoxTR.optional
+             ),
+             lseg: ROM::SQL::Types::PG::LineSegmentT.optional.meta(
+               name: :lseg,
+               source: source,
+               read: ROM::SQL::Types::PG::LineSegmentTR.optional
+             ),
+             polygon: ROM::SQL::Types::PG::PolygonT.optional.meta(
+               name: :polygon,
+               source: source,
+               read: ROM::SQL::Types::PG::PolygonTR.optional
+             ),
+             path: ROM::SQL::Types::PG::PathT.optional.meta(
+               name: :path,
+               source: source,
+               read: ROM::SQL::Types::PG::PathTR.optional
+             ),
+             created_at: ROM::SQL::Types::Time.optional.meta(name: :created_at, source: source),
+             datetime: ROM::SQL::Types::Time.optional.meta(name: :datetime, source: source),
+             datetime_tz: ROM::SQL::Types::Time.optional.meta(name: :datetime_tz, source: source),
+             flag: ROM::SQL::Types::Bool.meta(name: :flag, source: source)
+           )
     end
   end
 
@@ -137,7 +138,6 @@ RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
 
   context 'with a column with bi-directional mapping' do
     before do
-      conn.drop_table?(:test_bidirectional)
       conn.execute('create extension if not exists hstore')
 
       conn.create_table(:test_bidirectional) do
@@ -191,11 +191,12 @@ RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
         line: line, circle: circle, lseg: lseg, box: box,
         polygon: polygon, closed_path: closed_path, open_path: open_path
       )
-      expect(inserted).to eql(
-        id: 1, center: point, ip: dns, mapping: mapping,
-        line: line, circle: circle, lseg: lseg, box: box_corrected,
-        polygon: polygon, closed_path: closed_path, open_path: open_path
-      )
+      expect(inserted).
+        to eql(
+             id: 1, center: point, ip: dns, mapping: mapping,
+             line: line, circle: circle, lseg: lseg, box: box_corrected,
+             polygon: polygon, closed_path: closed_path, open_path: open_path
+           )
       expect(relation.to_a).to eql([inserted])
     end
   end

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

@@ -2,37 +2,36 @@ RSpec.describe 'ROM::SQL::Schema::SqliteInferrer', :sqlite do
   include_context 'database setup'
 
   before do
-    conn.drop_table?(:test_inferrence)
+    inferrable_relations.concat %i(test_inferrence)
+  end
 
+  before do
     conn.create_table :test_inferrence do
       tinyint :tiny
       int8 :big
+      bigint :long
       column :dummy, nil
+      boolean :flag, null: false
     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)
+    conf.relation(:test_inferrence) do
+      schema(infer: true)
     end
   end
 
-  it 'can infer attributes for dataset' do
-    source = container.relations[:test_inferrence].name
+  let(:schema) { container.relations[:test_inferrence].schema }
+  let(: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),
-      dummy: ROM::SQL::Types::SQLite::Object.optional.meta(name: :dummy, source: source)
-    )
+  it 'can infer attributes for dataset' do
+    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),
+           long: ROM::SQL::Types::Int.optional.meta(name: :long, source: source),
+           dummy: ROM::SQL::Types::SQLite::Object.optional.meta(name: :dummy, source: source),
+           flag: ROM::SQL::Types::Bool.meta(name: :flag, source: source)
+         )
   end
 end