torque-postgresql 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e36ced2b0986c132e095bbc1799e4fab1f7bd6f320e83d74f8387c9ad23b798
-  data.tar.gz: 4807f5dc5146805a349a5495829e0b4aac83df495982b08a35c9c593d8323d42
+  metadata.gz: 19cfac9293a2758ae928a2d1a8ab7aaf37b8d7ba1943f24c89b37eae28c04fa8
+  data.tar.gz: 213df2558e23565ab99f4a36feb7733e59437ddfe36b01f44d2603570f92f39f
 SHA512:
-  metadata.gz: 84cc6db0f08fcb8c6d0616784382f77ebca1440a396df0a06efa7c2b0e1e0ac6685d54c4b4f6ac5163a7ba42cbeb4b2f81fcb197e4836d894819e0f76d9545c4
-  data.tar.gz: 3624ca914923f61c0bf23a7eed17c8c7d71270b8d0853d3d1445b7a1e513a97d066d8a7041111e504a7b1e6aaaab391cc2502d8fb42e69052c46b97377f4dfb4
+  metadata.gz: 34df30f7080d5b44a59b59011a1f1751c122fa8aa9df50facfadb2b3a051547f922d03dfdb374b027c004dc5c757b84d655938f34ece4f48423556cccd7c5485
+  data.tar.gz: b63f3250fc36a88b39a66750e577eda7b734a621f8176dabde7eacbb2cf50d00b1db7fe451286210fefc3c5f43fb624f447290a55cd286611f9cc08e98e1ea35

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

@@ -33,9 +33,9 @@ module Torque
         end
 
         # Renames a type.
-        def rename_type(type_name, new_name)
+        def rename_type(type_name, new_name, options = {})
           execute <<-SQL.squish
-            ALTER TYPE #{quote_type_name(type_name)}
+            ALTER TYPE #{quote_type_name(type_name, options[:schema])}
             RENAME TO #{Quoting::Name.new(nil, new_name.to_s).quoted}
           SQL
         end
@@ -102,6 +102,18 @@ module Torque
           super table_name, **options, &block
         end
 
+        # Simply add the schema to the table name when changing a table
+        def change_table(table_name, **options)
+          table_name = "#{options[:schema]}.#{table_name}" if options[:schema].present?
+          super table_name, **options
+        end
+
+        # Simply add the schema to the table name when dropping a table
+        def drop_table(table_name, **options)
+          table_name = "#{options[:schema]}.#{table_name}" if options[:schema].present?
+          super table_name, **options
+        end
+
         # Add the schema option when extracting table options
         def table_options(table_name)
           parts = table_name.split('.').reverse

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

@@ -12,9 +12,9 @@ module Torque
         ## CUSTOM
         def ids_reader
           if loaded?
-            target.pluck(reflection.association_primary_key)
+            target.pluck(reflection.active_record_primary_key)
           elsif !target.empty?
-            load_target.pluck(reflection.association_primary_key)
+            load_target.pluck(reflection.active_record_primary_key)
           else
             stale_state || column_default_value
           end

data/lib/torque/postgresql/table_name.rb

@@ -12,8 +12,8 @@ module Torque
         return @schema if defined?(@schema)
 
         @schema = ([@klass] + @klass.module_parents[0..-2]).find do |klass|
-          next unless klass.respond_to?(:schema)
-          break klass.schema
+          next unless klass.respond_to?(:schema) && !(value = klass.schema).nil?
+          break value
         end
       end
 

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.4.1'
+    VERSION = '2.4.3'
   end
 end

data/spec/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-version = 2
+version = 3
 
 return if ActiveRecord::Migrator.current_version == version
 ActiveRecord::Schema.define(version: version) do
@@ -77,14 +77,14 @@ ActiveRecord::Schema.define(version: version) do
   create_table "texts", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "content"
-    t.enum     "conflict",  enum_type: :conflicts
+    t.enum     "conflict", enum_type: :conflicts
   end
 
   create_table "comments", force: :cascade do |t|
-    t.integer "user_id",    null: false
+    t.integer "user_id", null: false
     t.integer "comment_id"
     t.integer "video_id"
-    t.text    "content",    null: false
+    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
@@ -92,7 +92,7 @@ ActiveRecord::Schema.define(version: version) do
 
   create_table "courses", force: :cascade do |t|
     t.integer  "category_id"
-    t.string   "title",      null: false
+    t.string   "title", null: false
     t.interval "duration"
     t.enum     "types", enum_type: :types, array: true
     t.datetime "created_at", null: false
@@ -108,7 +108,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "activity_id"
     t.string   "title"
     t.text     "content"
-    t.enum     "status",    enum_type: :content_status
+    t.enum     "status", enum_type: :content_status
     t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
   end
 
@@ -120,8 +120,8 @@ ActiveRecord::Schema.define(version: version) do
   end
 
   create_table "users", force: :cascade do |t|
-    t.string   "name",       null: false
-    t.enum     "role",                    enum_type: :roles, default: :visitor
+    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
@@ -137,7 +137,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "author_id"
     t.string   "title"
     t.boolean  "active"
-    t.enum     "kind",                    enum_type: :types
+    t.enum     "kind", enum_type: :types
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

data/spec/tests/belongs_to_many_spec.rb

@@ -441,4 +441,45 @@ RSpec.describe 'BelongsToMany' do
       expect { query.load }.not_to raise_error
     end
   end
+
+  context 'using custom keys' do
+    let(:connection) { ActiveRecord::Base.connection }
+    let(:post) { Post }
+    let(:tag) { Tag }
+    let(:tags) { %w[a b c].map { |id| create(:tag, friendly_id: id) } }
+
+    subject { create(:post) }
+
+    before do
+      connection.add_column(:tags, :friendly_id, :string)
+      connection.add_column(:posts, :friendly_tag_ids, :string, array: true)
+      post.belongs_to_many(:tags, foreign_key: :friendly_tag_ids, primary_key: :friendly_id)
+      post.reset_column_information
+      tag.reset_column_information
+    end
+
+    after do
+      tag.reset_column_information
+      post.reset_column_information
+      post._reflections.delete(:tags)
+    end
+
+    it 'loads associated records' do
+      subject.update(friendly_tag_ids: tags.pluck(:friendly_id))
+
+      expect(subject.tags.to_sql).to be_eql(<<-SQL.squish)
+        SELECT "tags".* FROM "tags" WHERE "tags"."friendly_id" IN ('a', 'b', 'c')
+      SQL
+
+      expect(subject.tags.load).to be_a(ActiveRecord::Associations::CollectionProxy)
+      expect(subject.tags.to_a).to be_eql(tags)
+    end
+
+    it 'can properly assign tags' do
+      expect(subject.friendly_tag_ids).to be_blank
+
+      subject.tags = tags
+      expect(subject.friendly_tag_ids).to be_eql(%w[a b c])
+    end
+  end
 end

data/spec/tests/distinct_on_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe 'DistinctOn' do
     end
 
     it 'raises with invalid relation' do
-      expect { subject.distinct_on(tags: :name).to_sql }.to \
+      expect { subject.distinct_on(supervisors: :name).to_sql }.to \
         raise_error(ArgumentError, /Relation for/)
     end
 

data/spec/tests/relation_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe 'Relation', type: :helper do
     end
 
     it 'raises on relation not present' do
-      check = [tags: :name]
+      check = [supervisors: :name]
       expect{ subject.call(check) }.to raise_error(ArgumentError, /Relation for/)
     end
 

data/spec/tests/schema_spec.rb

@@ -40,6 +40,26 @@ RSpec.describe 'Schema' do
       connection.schemas_whitelist.push('legacy')
       expect(connection.schema_exists?(:legacy)).to be_truthy
     end
+
+    context 'reverting' do
+      let(:migration) { ActiveRecord::Migration::Current.new('Testing') }
+
+      before { connection.create_schema(:legacy) }
+
+      it 'reverts the creation of a schema' do
+        expect(connection.schema_exists?(:legacy, filtered: false)).to be_truthy
+        migration.revert { migration.connection.create_schema(:legacy) }
+        expect(connection.schema_exists?(:legacy, filtered: false)).to be_falsey
+      end
+
+      it 'reverts the creation of a table' do
+        connection.create_table(:users, schema: :legacy) { |t| t.string(:name) }
+
+        expect(connection.table_exists?('legacy.users')).to be_truthy
+        migration.revert { migration.connection.create_table(:users, schema: :legacy) }
+        expect(connection.table_exists?('legacy.users')).to be_falsey
+      end
+    end
   end
 
   context 'on schema' do
@@ -86,8 +106,11 @@ RSpec.describe 'Schema' do
 
   context 'on relation' do
     let(:model) { Internal::User }
+    let(:table_name) { Torque::PostgreSQL::TableName.new(model, 'users') }
 
     it 'adds the schema to the query' do
+      model.reset_table_name
+      expect(table_name.to_s).to eq('internal.users')
       expect(model.all.to_sql).to match(/FROM "internal"."users"/)
     end
 
@@ -95,7 +118,17 @@ RSpec.describe 'Schema' do
       allow(Internal).to receive(:schema).and_return('internal')
       allow(model).to receive(:schema).and_return(nil)
 
+      model.reset_table_name
+      expect(table_name.to_s).to eq('internal.users')
       expect(model.all.to_sql).to match(/FROM "internal"."users"/)
     end
+
+    it 'does not change anything if the model has not configured a schema' do
+      allow(model).to receive(:schema).and_return(nil)
+
+      model.reset_table_name
+      expect(table_name.to_s).to eq('users')
+      expect(model.all.to_sql).to match(/FROM "users"/)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Carlos Silva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,6 +134,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,6 +147,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +305,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/crashtech/torque-postgresql
   bug_tracker_uri: https://github.com/crashtech/torque-postgresql/issues
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--title"
 - Torque PostgreSQL
@@ -317,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubygems_version: 3.2.15
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
 test_files: