torque-postgresql 2.2.1 → 3.0.0

data/spec/schema.rb

@@ -10,151 +10,151 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-begin
-  version = 73
-
-  raise SystemExit if ActiveRecord::Migrator.current_version == version
-  ActiveRecord::Schema.define(version: version) do
-    self.verbose = false
-
-    # These are extensions that must be enabled in order to support this database
-    enable_extension "pgcrypto"
-    enable_extension "plpgsql"
-
-    # These are user-defined types used on this database
-    create_enum "content_status", ["created", "draft", "published", "archived"], force: :cascade
-    create_enum "specialties", ["books", "movies", "plays"], force: :cascade
-    create_enum "roles", ["visitor", "assistant", "manager", "admin"], force: :cascade
-    create_enum "conflicts", ["valid", "invalid", "untrusted"], force: :cascade
-    create_enum "types", ["A", "B", "C", "D"], force: :cascade
-
-    create_table "geometries", force: :cascade do |t|
-      t.point   "point"
-      t.line    "line"
-      t.lseg    "lseg"
-      t.box     "box"
-      t.path    "closed_path"
-      t.path    "open_path"
-      t.polygon "polygon"
-      t.circle  "circle"
-    end
-
-    create_table "time_keepers", force: :cascade do |t|
-      t.daterange "available"
-      t.tsrange   "period"
-      t.tstzrange "tzperiod"
-      t.interval  "th"
-    end
-
-    create_table "tags", force: :cascade do |t|
-      t.string "name"
-    end
-
-    create_table "videos", force: :cascade do |t|
-      t.bigint   "tag_ids", array: true
-      t.string   "title"
-      t.string   "url"
-      t.enum     "type", subtype: :types
-      t.enum     "conflicts", subtype: :conflicts, array: true
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    create_table "authors", force: :cascade do |t|
-      t.string   "name"
-      t.string   "type"
-      t.enum     "specialty", subtype: :specialties
-    end
-
-    create_table "texts", force: :cascade do |t|
-      t.integer  "user_id"
-      t.string   "content"
-      t.enum     "conflict",  subtype: :conflicts
-    end
-
-    create_table "comments", force: :cascade do |t|
-      t.integer "user_id",    null: false
-      t.integer "comment_id"
-      t.integer "video_id"
-      t.text    "content",    null: false
-      t.string  "kind"
-      t.index ["user_id"], name: "index_comments_on_user_id", using: :btree
-      t.index ["comment_id"], name: "index_comments_on_comment_id", using: :btree
-    end
-
-    create_table "courses", force: :cascade do |t|
-      t.string   "title",      null: false
-      t.interval "duration"
-      t.enum     "types", subtype: :types, array: true
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    create_table "images", force: :cascade, id: false do |t|
-      t.string "file"
-    end
-
-    create_table "posts", force: :cascade do |t|
-      t.integer  "author_id"
-      t.integer  "activity_id"
-      t.string   "title"
-      t.text     "content"
-      t.enum     "status",    subtype: :content_status
-      t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
-    end
-
-    create_table "items", force: :cascade do |t|
-      t.string   "name"
-      t.bigint   "tag_ids", array: true, default: "{1}"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    create_table "users", force: :cascade do |t|
-      t.string   "name",       null: false
-      t.enum     "role",                    subtype: :roles, default: :visitor
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    create_table "activities", force: :cascade do |t|
-      t.integer  "author_id"
-      t.string   "title"
-      t.boolean  "active"
-      t.enum     "kind",                    subtype: :types
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    create_table "questions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-      t.string   "title"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    create_table "activity_books", force: :cascade, inherits: :activities do |t|
-      t.text     "description"
-      t.string   "url"
-      t.boolean  "activated"
-    end
-
-    create_table "activity_posts", force: :cascade, inherits: [:activities, :images] do |t|
-      t.integer  "post_id"
-      t.string   "url"
-      t.integer  "activated"
-    end
-
-    create_table "activity_post_samples", force: :cascade, inherits: :activity_posts
-
-    create_table "question_selects", force: :cascade, inherits: :questions do |t|
-      t.string  "options", array: true
-    end
-
-    # create_table "activity_blanks", force: :cascade, inherits: :activities
-
-    # create_table "activity_images", force: :cascade, inherits: [:activities, :images]
-
-    add_foreign_key "posts", "authors"
-  end
-rescue SystemExit
+version = 2
+
+return if ActiveRecord::Migrator.current_version == version
+ActiveRecord::Schema.define(version: version) do
+  self.verbose = false
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "pgcrypto"
+  enable_extension "plpgsql"
+
+  # Custom types defined in this database.
+  # Note that some types may not work with other database engines. Be careful if changing database.
+  create_enum "content_status", ["created", "draft", "published", "archived"]
+  create_enum "specialties", ["books", "movies", "plays"]
+  create_enum "roles", ["visitor", "assistant", "manager", "admin"]
+  create_enum "conflicts", ["valid", "invalid", "untrusted"]
+  create_enum "types", ["A", "B", "C", "D"]
+
+  create_table "geometries", force: :cascade do |t|
+    t.point   "point"
+    t.line    "line"
+    t.lseg    "lseg"
+    t.box     "box"
+    t.path    "closed_path"
+    t.path    "open_path"
+    t.polygon "polygon"
+    t.circle  "circle"
+  end
+
+  create_table "time_keepers", force: :cascade do |t|
+    t.daterange "available"
+    t.tsrange   "period"
+    t.tstzrange "tzperiod"
+    t.interval  "th"
+  end
+
+  create_table "tags", force: :cascade do |t|
+    t.string "name"
+  end
+
+  create_table "videos", force: :cascade do |t|
+    t.bigint   "tag_ids", array: true
+    t.string   "title"
+    t.string   "url"
+    t.enum     "type", enum_type: :types
+    t.enum     "conflicts", enum_type: :conflicts, array: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "authors", force: :cascade do |t|
+    t.string   "name"
+    t.string   "type"
+    t.enum     "specialty", enum_type: :specialties
+  end
+
+  create_table "texts", force: :cascade do |t|
+    t.integer  "user_id"
+    t.string   "content"
+    t.enum     "conflict",  enum_type: :conflicts
+  end
+
+  create_table "comments", force: :cascade do |t|
+    t.integer "user_id",    null: false
+    t.integer "comment_id"
+    t.integer "video_id"
+    t.text    "content",    null: false
+    t.string  "kind"
+    t.index ["user_id"], name: "index_comments_on_user_id", using: :btree
+    t.index ["comment_id"], name: "index_comments_on_comment_id", using: :btree
+  end
+
+  create_table "courses", force: :cascade do |t|
+    t.string   "title",      null: false
+    t.interval "duration"
+    t.enum     "types", enum_type: :types, array: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "images", force: :cascade, id: false do |t|
+    t.string "file"
+  end
+
+  create_table "posts", force: :cascade do |t|
+    t.integer  "author_id"
+    t.integer  "activity_id"
+    t.string   "title"
+    t.text     "content"
+    t.enum     "status",    enum_type: :content_status
+    t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
+  end
+
+  create_table "items", force: :cascade do |t|
+    t.string   "name"
+    t.bigint   "tag_ids", array: true, default: "{1}"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.string   "name",       null: false
+    t.enum     "role",                    enum_type: :roles, default: :visitor
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "activities", force: :cascade do |t|
+    t.integer  "author_id"
+    t.string   "title"
+    t.boolean  "active"
+    t.enum     "kind",                    enum_type: :types
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "questions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string   "title"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "activity_books", force: :cascade, inherits: :activities do |t|
+    t.text     "description"
+    t.string   "url"
+    t.boolean  "activated"
+  end
+
+  create_table "activity_posts", force: :cascade, inherits: [:activities, :images] do |t|
+    t.integer  "post_id"
+    t.string   "url"
+    t.integer  "activated"
+  end
+
+  create_table "activity_post_samples", force: :cascade, inherits: :activity_posts
+
+  create_table "question_selects", force: :cascade, inherits: :questions do |t|
+    t.string  "options", array: true
+  end
+
+  # create_table "activity_blanks", force: :cascade, inherits: :activities
+
+  # create_table "activity_images", force: :cascade, inherits: [:activities, :images]
+
+  add_foreign_key "posts", "authors"
 end
+
+ActiveRecord::Base.connection.schema_cache.clear!

data/spec/spec_helper.rb

@@ -8,9 +8,13 @@ require 'byebug'
 
 Dotenv.load
 
-ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
-cache = ActiveRecord::Base.connection.schema_cache
+ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'] || {
+  adapter: 'postgresql',
+  username: 'travis',
+  port: 5433,
+})
 
+cache = ActiveRecord::Base.connection.schema_cache
 cleaner = ->() do
   cache.instance_variable_set(:@inheritance_loaded, false)
   cache.instance_variable_set(:@inheritance_dependencies, {})
@@ -27,6 +31,7 @@ I18n.load_path << Pathname.pwd.join('spec', 'en.yml')
 RSpec.configure do |config|
   config.extend Mocks::CreateTable
   config.include Mocks::CacheQuery
+  config.include FactoryBot::Syntax::Methods
 
   config.formatter = :documentation
   config.color     = true
@@ -41,10 +46,6 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, js: true) do
-    DatabaseCleaner.strategy = :truncation
-  end
-
   config.before(:each) do
     DatabaseCleaner.start
   end

data/spec/tests/arel_spec.rb

@@ -51,10 +51,14 @@ RSpec.describe 'Arel' do
   context 'on default value' do
     let(:connection) { ActiveRecord::Base.connection }
 
-    before(:context) { Torque::PostgreSQL.config.use_extended_defaults = true }
-    after(:context) { Torque::PostgreSQL.config.use_extended_defaults = false }
     after { Author.reset_column_information }
 
+    it 'does not break the change column default value method' do
+      connection.add_column(:authors, :enabled, :boolean)
+      expect { connection.change_column_default(:authors, :enabled, { from: nil, to: true }) }.not_to raise_error
+      expect(Author.columns_hash['enabled'].default).to eq('true')
+    end
+
     it 'does not break jsonb' do
       expect { connection.add_column(:authors, :profile, :jsonb, default: []) }.not_to raise_error
       expect(Author.columns_hash['profile'].default).to eq('[]')
@@ -62,19 +66,37 @@ RSpec.describe 'Arel' do
 
     it 'works properly when column is an array' do
       expect { connection.add_column(:authors, :tag_ids, :bigint, array: true, default: []) }.not_to raise_error
-      expect(Author.columns_hash['tag_ids'].default).to eq([])
+      expect(Author.new.tag_ids).to eq([])
+    end
+
+    it 'works with an array with enum values for a new enum' do
+      value = ['a', 'b']
+
+      expect do
+        connection.create_enum(:samples, %i[a b c d])
+        connection.add_column(:authors, :samples, :enum, enum_type: :samples, array: true, default: value)
+      end.not_to raise_error
+
+      expect(Author.new.samples).to eq(value)
     end
 
-    it 'works with an array with enum values' do
+    it 'works with an array with enum values for an existing enum' do
       value = ['visitor', 'assistant']
-      expect { connection.add_column(:authors, :roles, :roles, array: true, default: value) }.not_to raise_error
-      expect(Author.columns_hash['roles'].default).to eq(value)
+      expect { connection.add_column(:authors, :roles, :enum, enum_type: :roles, array: true, default: value) }.not_to raise_error
+      expect(Author.new.roles).to eq(value)
     end
 
     it 'works with multi dimentional array' do
       value = [['1', '2'], ['3', '4']]
       expect { connection.add_column(:authors, :tag_ids, :string, array: true, default: value) }.not_to raise_error
-      expect(Author.columns_hash['tag_ids'].default).to eq(value)
+      expect(Author.new.tag_ids).to eq(value)
+    end
+
+    it 'works with change column default value' do
+      value = ['2', '3']
+      connection.add_column(:authors, :tag_ids, :string, array: true)
+      expect { connection.change_column_default(:authors, :tag_ids, { from: nil, to: value }) }.not_to raise_error
+      expect(Author.new.tag_ids).to eq(value)
     end
   end
 

data/spec/tests/belongs_to_many_spec.rb

@@ -339,6 +339,20 @@ RSpec.describe 'BelongsToMany' do
       expect(entries.first.tags.size).to be_eql(5)
     end
 
+    it 'can preload records using ActiveRecord::Associations::Preloader' do
+      records = FactoryBot.create_list(:tag, 5)
+      subject.tags.concat(records)
+
+      entries = Video.all
+      arguments = { records: entries, associations: :tags, available_records: Tag.all.to_a }
+      ActiveRecord::Associations::Preloader.new(**arguments).call
+      entries = entries.load
+
+      expect(entries.size).to be_eql(1)
+      expect(entries.first.tags).to be_loaded
+      expect(entries.first.tags.size).to be_eql(5)
+    end
+
     it 'can joins records' do
       query = Video.all.joins(:tags)
       expect(query.to_sql).to match(/INNER JOIN "tags"/)

data/spec/tests/enum_set_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 RSpec.describe 'Enum' do
   let(:connection) { ActiveRecord::Base.connection }
   let(:attribute_klass) { Torque::PostgreSQL::Attributes::EnumSet }
+  let(:table_definition) { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition }
 
   def decorate(model, field, options = {})
     attribute_klass.include_on(model, :enum_set)
@@ -25,12 +26,13 @@ RSpec.describe 'Enum' do
   end
 
   context 'on table definition' do
-    subject { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.new('articles') }
+    subject { table_definition.new(connection, 'articles') }
 
     it 'can be defined as an array' do
-      subject.enum(:content_status, array: true)
+      subject.enum(:content_status, array: true, enum_type: :content_status)
       expect(subject['content_status'].name).to be_eql('content_status')
-      expect(subject['content_status'].type).to be_eql(:content_status)
+      expect(subject['content_status'].type).to be_eql(:enum)
+      expect(subject['content_status'].options[:enum_type]).to be_eql(:content_status)
 
       array = subject['content_status'].respond_to?(:options) \
         ? subject['content_status'].options[:array] \
@@ -43,14 +45,14 @@ RSpec.describe 'Enum' do
   context 'on schema' do
     it 'can be used on tables' do
       dump_io = StringIO.new
-      checker = /t\.enum +"conflicts", +array: true, +subtype: :conflicts/
+      checker = /t\.enum +"conflicts", +array: true, +enum_type: "conflicts"/
       ActiveRecord::SchemaDumper.dump(connection, dump_io)
       expect(dump_io.string).to match checker
     end
 
     xit 'can have a default value as an array of symbols' do
       dump_io = StringIO.new
-      checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +subtype: :types/
+      checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +enum_type: "types"/
       ActiveRecord::SchemaDumper.dump(connection, dump_io)
       expect(dump_io.string).to match checker
     end

data/spec/tests/enum_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 RSpec.describe 'Enum' do
   let(:connection) { ActiveRecord::Base.connection }
   let(:attribute_klass) { Torque::PostgreSQL::Attributes::Enum }
+  let(:table_definition) { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition }
 
   def decorate(model, field, options = {})
     attribute_klass.include_on(model, :pg_enum)
@@ -25,12 +26,6 @@ RSpec.describe 'Enum' do
   end
 
   context 'on migration' do
-    it 'can be created' do
-      connection.create_enum(:status, %i(foo bar))
-      expect(connection.type_exists?(:status)).to be_truthy
-      expect(connection.enum_values(:status)).to be_eql(['foo', 'bar'])
-    end
-
     it 'can be deleted' do
       connection.create_enum(:status, %i(foo bar))
       expect(connection.type_exists?(:status)).to be_truthy
@@ -45,16 +40,6 @@ RSpec.describe 'Enum' do
       expect(connection.type_exists?(:status)).to be_truthy
     end
 
-    it 'can have prefix' do
-      connection.create_enum(:status, %i(foo bar), prefix: true)
-      expect(connection.enum_values(:status)).to be_eql(['status_foo', 'status_bar'])
-    end
-
-    it 'can have suffix' do
-      connection.create_enum(:status, %i(foo bar), suffix: 'tst')
-      expect(connection.enum_values(:status)).to be_eql(['foo_tst', 'bar_tst'])
-    end
-
     it 'inserts values at the end' do
       connection.create_enum(:status, %i(foo bar))
       connection.add_enum_values(:status, %i(baz qux))
@@ -84,74 +69,6 @@ RSpec.describe 'Enum' do
     end
   end
 
-  context 'on table definition' do
-    subject { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.new('articles') }
-
-    it 'has the enum method' do
-      expect(subject).to respond_to(:enum)
-    end
-
-    it 'can be used in a single form' do
-      subject.enum('content_status')
-      expect(subject['content_status'].name).to be_eql('content_status')
-      expect(subject['content_status'].type).to be_eql(:content_status)
-    end
-
-    it 'can be used in a multiple form' do
-      subject.enum('foo', 'bar', 'baz', subtype: :content_status)
-      expect(subject['foo'].type).to be_eql(:content_status)
-      expect(subject['bar'].type).to be_eql(:content_status)
-      expect(subject['baz'].type).to be_eql(:content_status)
-    end
-
-    it 'can have custom type' do
-      subject.enum('foo', subtype: :content_status)
-      expect(subject['foo'].name).to be_eql('foo')
-      expect(subject['foo'].type).to be_eql(:content_status)
-    end
-
-    it 'raises StatementInvalid when type isn\'t defined' do
-      subject.enum('foo')
-      creation = connection.send(:schema_creation).accept subject
-      expect{ connection.execute creation }.to raise_error(ActiveRecord::StatementInvalid)
-    end
-  end
-
-  context 'on schema' do
-    it 'dumps when has it' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match /create_enum \"content_status\", \[/
-    end
-
-    it 'sorts the enum entries to better consistency' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      items = dump_io.string.scan(/create_enum "(\w+)"/).flatten
-      expect(items).to be_eql(items.sort)
-    end
-
-    it 'do not dump when has none' do
-      connection.drop_type(:content_status, force: :cascade)
-
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).not_to match /create_enum \"content_status\", \[/
-    end
-
-    it 'can be used on tables too' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match /t\.enum +"status", +subtype: :content_status/
-    end
-
-    it 'can have a default value as symbol' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match /t\.enum +"role", +default: :visitor, +subtype: :roles/
-    end
-  end
-
   context 'on value' do
     subject { Enum::ContentStatus }
     let(:values) { %w(created draft published archived) }

data/spec/tests/interval_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'Interval' do
   let(:connection) { ActiveRecord::Base.connection }
+  let(:table_definition) { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition }
 
   context 'on settings' do
     it 'must be set to ISO 8601' do
@@ -10,7 +11,7 @@ RSpec.describe 'Interval' do
   end
 
   context 'on table definition' do
-    subject { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.new('articles') }
+    subject { table_definition.new(connection, 'articles') }
 
     it 'has the interval method' do
       expect(subject).to respond_to(:interval)