torque-postgresql 2.2.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb3d81538edfb988d8566295fac7d055208e399d552b619d9d8b3b9234254686
-  data.tar.gz: 7c7c62bec966085eccbdc351041a94d04788e40f84b1120d88c1673c9d0e3b3c
+  metadata.gz: 3e9379e388022831a9441cb6b3b646ff8bdea7340cba61f0dd197bcdbf589f72
+  data.tar.gz: cfb88b94086027202e92a2120ad8ba1a5e939ef089aea5dcdfd85e05a7d122ea
 SHA512:
-  metadata.gz: 93cf49b971a0013d3f10263917437b7a552632e62f462d43b91aaad86ec66ba10b20a014bf2bbcaa883f1c6801df423fd3d98dd8d9546bd849920bb98b743e6c
-  data.tar.gz: 88cf63c02e13e80e48b5dfbe66e9157a52ecc8cc11410f0688e97a6c28e7f25a03adc9c7b71a45ffe9384a81debbf1a29d55363145a4ae6568c82cc9f7207a30
+  metadata.gz: 809642eb8f6ee574e7b3b9557590baa58624fec54d1c69b6f341999dfc4217aea5010abc1b438119b3213f958918ce00ddd1af1df3a4714321b1f6153f8ee57d
+  data.tar.gz: e81cf089a977d964326548144b14dd4ab7ce4be0612f2e923e34add1aa951aa2e5467daaa544da42ac17773fb2cc047335a297f3807a1e72f8dc1942f1df4195

data/lib/torque/postgresql/adapter/quoting.rb

@@ -6,6 +6,8 @@ module Torque
       module Quoting
 
         Name = ActiveRecord::ConnectionAdapters::PostgreSQL::Name
+        Column = ActiveRecord::ConnectionAdapters::PostgreSQL::Column
+        ColumnDefinition = ActiveRecord::ConnectionAdapters::ColumnDefinition
 
         # Quotes type names for use in SQL queries.
         def quote_type_name(string, schema = nil)
@@ -20,11 +22,12 @@ module Torque
         end
 
         def quote_default_expression(value, column)
-          if column.dig(:options, :array) && value.class <= Array
-            quote(value) + '::' + column.sql_type
-          else
-            super
-          end
+          return super unless value.class <= Array &&
+            ((column.is_a?(ColumnDefinition) && column.dig(:options, :array)) ||
+            (column.is_a?(Column) && column.array?))
+
+          type = column.is_a?(Column) ? column.sql_type_metadata.sql_type : column.sql_type
+          quote(value) + '::' + type
         end
 
         private

data/lib/torque/postgresql/associations/belongs_to_many_association.rb

@@ -53,7 +53,8 @@ module Torque
 
         def load_target
           if stale_target? || find_target?
-            @target = merge_target_lists(find_target, target)
+            new_records = PostgreSQL::AR615 ? target.extract!(&:persisted?) : []
+            @target = merge_target_lists((find_target || []) + new_records, target)
           end
 
           loaded!

data/lib/torque/postgresql/config.rb

@@ -7,6 +7,7 @@ module Torque
     # Stores a version check for compatibility purposes
     AR604 = (ActiveRecord.gem_version >= Gem::Version.new('6.0.4'))
     AR610 = (ActiveRecord.gem_version >= Gem::Version.new('6.1.0'))
+    AR615 = (ActiveRecord.gem_version >= Gem::Version.new('6.1.5'))
 
     # Use the same logger as the Active Record one
     def self.logger

data/lib/torque/postgresql/relation.rb

@@ -117,7 +117,7 @@ module Torque
       # because the type mapper may add new methods to the model. This happens
       # for the given model Klass and its inheritances
       module Initializer
-        def initialize(klass, *)
+        def initialize(klass, *, **)
           super
 
           klass.superclass.send(:relation) if klass.define_attribute_methods &&

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.2.0'
+    VERSION = '2.2.3'
   end
 end

data/spec/models/question_select.rb

@@ -1,2 +1,4 @@
+require_relative 'question'
+
 class QuestionSelect < Question
 end

data/spec/schema.rb

@@ -10,151 +10,150 @@
 #
 # 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 = 77
+
+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"
+
+  # 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
+
+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

data/spec/tests/arel_spec.rb

@@ -55,6 +55,12 @@ RSpec.describe 'Arel' do
     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('[]')
@@ -76,6 +82,13 @@ RSpec.describe 'Arel' do
       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)
     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.columns_hash['tag_ids'].default).to eq(value)
+    end
   end
 
   context 'on cast' do

data/spec/tests/belongs_to_many_spec.rb

@@ -339,6 +339,19 @@ 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
+      ActiveRecord::Associations::Preloader.new.preload(entries, :tags, Tag.all)
+      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,7 +26,7 @@ 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)

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)
@@ -85,7 +86,7 @@ RSpec.describe 'Enum' do
   end
 
   context 'on table definition' do
-    subject { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.new('articles') }
+    subject { table_definition.new(connection, 'articles') }
 
     it 'has the enum method' do
       expect(subject).to respond_to(:enum)

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Carlos Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,40 +124,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 6.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.20'
 description: Add support to complex resources of PostgreSQL, like data types, array
   associations, and auxiliary statements (CTE)
 email:
@@ -292,7 +286,7 @@ homepage: https://github.com/crashtech/torque-postgresql
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -300,15 +294,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
 test_files:
@@ -325,8 +319,8 @@ test_files:
 - spec/mocks/create_table.rb
 - spec/models/activity.rb
 - spec/models/activity_book.rb
-- spec/models/activity_post.rb
 - spec/models/activity_post/sample.rb
+- spec/models/activity_post.rb
 - spec/models/author.rb
 - spec/models/author_journalist.rb
 - spec/models/comment.rb
@@ -335,13 +329,14 @@ test_files:
 - spec/models/guest_comment.rb
 - spec/models/item.rb
 - spec/models/post.rb
+- spec/models/question.rb
+- spec/models/question_select.rb
 - spec/models/tag.rb
 - spec/models/text.rb
 - spec/models/time_keeper.rb
 - spec/models/user.rb
 - spec/models/video.rb
-- spec/models/question.rb
-- spec/models/question_select.rb
+- spec/schema.rb
 - spec/spec_helper.rb
 - spec/tests/arel_spec.rb
 - spec/tests/auxiliary_statement_spec.rb
@@ -360,4 +355,3 @@ test_files:
 - spec/tests/range_spec.rb
 - spec/tests/relation_spec.rb
 - spec/tests/table_inheritance_spec.rb
-- spec/schema.rb