torque-postgresql 2.0.0 → 2.0.5

data/lib/torque/postgresql/relation/auxiliary_statement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation
@@ -34,7 +36,10 @@ module Torque
         # attributes as well
         def bound_attributes
           visitor = ::Arel::Visitors::PostgreSQL.new(ActiveRecord::Base.connection)
-          visitor.accept(self.arel.ast, ::Arel::Collectors::Bind.new).value
+          visitor.accept(self.arel.ast, ::Arel::Collectors::Composite.new(
+            ::Arel::Collectors::SQLString.new,
+            ::Arel::Collectors::Bind.new,
+          )).value.last
         end
 
         private

data/lib/torque/postgresql/relation/distinct_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/relation/inheritance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/relation/merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/schema_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     LookupError = Class.new(ArgumentError)

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
-    VERSION = '2.0.0'
+    VERSION = '2.0.5'
   end
 end

data/spec/schema.rb

@@ -11,7 +11,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 begin
-  version = 61
+  version = 62
 
   raise SystemExit if ActiveRecord::Migrator.current_version == version
   ActiveRecord::Schema.define(version: version) do
@@ -83,7 +83,7 @@ begin
     create_table "courses", force: :cascade do |t|
       t.string   "title",      null: false
       t.interval "duration"
-      t.enum     "types", subtype: :types, array: true, default: [:A, :B]
+      t.enum     "types", subtype: :types, array: true
       t.datetime "created_at", null: false
       t.datetime "updated_at", null: false
     end

data/spec/tests/arel_spec.rb

@@ -25,7 +25,9 @@ RSpec.describe 'Arel' do
       klass_name = operator.to_s.camelize
 
       context "##{operator}" do
-        let(:instance) { attribute.public_send(operator, value) }
+        let(:instance) do
+          attribute.public_send(operator, value.is_a?(Array) ? ::Arel.array(value) : value)
+        end
 
         context 'for attribute' do
           let(:klass) { ::Arel::Nodes.const_get(klass_name) }

data/spec/tests/belongs_to_many_spec.rb

@@ -35,6 +35,11 @@ RSpec.describe 'BelongsToMany' do
       expect(subject._reflections).to include('tags')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['tags']
+      expect(item.foreign_key).to be_eql('tag_ids')
+    end
+
     it 'loads associated records' do
       subject.update(tag_ids: [initial.id])
       expect(subject.tags.to_sql).to be_eql(<<-SQL.squish)
@@ -116,6 +121,7 @@ RSpec.describe 'BelongsToMany' do
 
       subject.tags.concat(other.new(name: 'Test'))
       subject.tags.reload
+
       expect(subject.tags.size).to be_eql(2)
       expect(subject.tag_ids.size).to be_eql(2)
       expect(subject.tags.last.name).to be_eql('Test')

data/spec/tests/enum_set_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe 'Enum' do
       expect(dump_io.string).to match checker
     end
 
-    it 'can have a default value as an array of symbols' do
+    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/
       ActiveRecord::SchemaDumper.dump(connection, dump_io)

data/spec/tests/enum_spec.rb

@@ -124,6 +124,13 @@ RSpec.describe 'Enum' do
       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)
 

data/spec/tests/has_many_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe 'HasMany' do
     let(:builder) { ActiveRecord::Associations::Builder::HasMany }
 
     it 'adds the array option' do
-      expect(builder.send(:valid_options, [])).to include(:array)
+      expect(builder.send(:valid_options, {})).to include(:array)
     end
   end
 
@@ -21,6 +21,11 @@ RSpec.describe 'HasMany' do
       expect(subject._reflections).to include('texts')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['texts']
+      expect(item.foreign_key).to be_eql('user_id')
+    end
+
     it 'loads associated records' do
       expect(subject.texts.to_sql).to match(Regexp.new(<<-SQL.squish))
         SELECT "texts"\\.\\* FROM "texts" WHERE \\(?"texts"\\."user_id" = #{subject.id}\\)?
@@ -210,6 +215,11 @@ RSpec.describe 'HasMany' do
       expect(subject._reflections).to include('videos')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['videos']
+      expect(item.foreign_key).to be_eql('tag_ids')
+    end
+
     it 'loads associated records' do
       expect(subject.videos.to_sql).to match(Regexp.new(<<-SQL.squish))
         SELECT "videos"\\.\\* FROM "videos"

data/spec/tests/table_inheritance_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe 'TableInheritance' do
 
     it 'allows empty-body create table operation' do
       sql = connection.create_table(:activity_posts, inherits: :activities)
-      result = 'CREATE TABLE "activity_posts" ()'
+      result = "CREATE TABLE \"activity_posts\" ()"
       result << ' INHERITS ( "activities" )'
       expect(sql).to eql(result)
     end
@@ -231,6 +231,19 @@ RSpec.describe 'TableInheritance' do
       expect(child2.table_name).to eql('activity_books')
       expect(other.table_name).to eql('authors')
     end
+
+    it 'respects the table name prefix and sufix defined on parent module' do
+      mod = Object.const_set('Private', Module.new)
+      mod.define_singleton_method(:table_name_prefix) { 'private.' }
+      mod.define_singleton_method(:table_name_suffix) { '_bundle' }
+      result = 'private.activity_post_others_bundle'
+
+      klass = mod.const_set('Other', Class.new(ActivityPost))
+      allow(klass).to receive(:module_parent).and_return(child)
+      allow(klass).to receive(:module_parents).and_return([mod])
+      allow(klass).to receive(:physically_inherited?).and_return(true)
+      expect(klass.send(:compute_table_name)).to be_eql(result)
+    end
   end
 
   context 'on relation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.5
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-23 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -211,7 +211,6 @@ files:
 - lib/torque/postgresql/attributes/enum_set.rb
 - lib/torque/postgresql/attributes/lazy.rb
 - lib/torque/postgresql/attributes/period.rb
-- lib/torque/postgresql/autosave_association.rb
 - lib/torque/postgresql/auxiliary_statement.rb
 - lib/torque/postgresql/auxiliary_statement/settings.rb
 - lib/torque/postgresql/base.rb
@@ -303,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
@@ -333,11 +332,10 @@ test_files:
 - spec/factories/videos.rb
 - spec/tests/geometric_builder_spec.rb
 - spec/tests/range_spec.rb
-- spec/tests/auxiliary_statement_spec.rb
-- spec/tests/belongs_to_many_spec.rb
-- spec/tests/has_many_spec.rb
-- spec/tests/period_spec.rb
 - spec/tests/table_inheritance_spec.rb
+- spec/tests/enum_spec.rb
+- spec/tests/auxiliary_statement_spec.rb
+- spec/tests/enum_set_spec.rb
 - spec/tests/coder_spec.rb
 - spec/tests/collector_spec.rb
 - spec/tests/distinct_on_spec.rb
@@ -345,9 +343,10 @@ test_files:
 - spec/tests/lazy_spec.rb
 - spec/tests/quoting_spec.rb
 - spec/tests/relation_spec.rb
+- spec/tests/belongs_to_many_spec.rb
+- spec/tests/period_spec.rb
 - spec/tests/arel_spec.rb
-- spec/tests/enum_set_spec.rb
-- spec/tests/enum_spec.rb
+- spec/tests/has_many_spec.rb
 - spec/mocks/cache_query.rb
 - spec/mocks/create_table.rb
 - spec/en.yml

data/lib/torque/postgresql/autosave_association.rb

@@ -1,39 +0,0 @@
-module Torque
-  module PostgreSQL
-    module AutosaveAssociation
-      module ClassMethods
-        def add_autosave_association_callbacks(reflection)
-          return super unless reflection.macro.eql?(:belongs_to_many)
-
-          save_method = :"autosave_associated_records_for_#{reflection.name}"
-          define_non_cyclic_method(save_method) { save_belongs_to_many_array(reflection) }
-
-          before_save(:before_save_collection_association)
-          after_save(:after_save_collection_association) if ::ActiveRecord::Base
-            .instance_methods.include?(:after_save_collection_association)
-
-          before_create(save_method)
-          before_update(save_method)
-
-          define_autosave_validation_callbacks(reflection)
-        end
-      end
-
-      def save_belongs_to_many_array(reflection)
-        save_collection_association(reflection)
-
-        association = association_instance_get(reflection.name)
-        return unless association
-
-        klass_fk = reflection.foreign_key
-        acpk = reflection.active_record_primary_key
-
-        records = association.target.each_with_object(klass_fk)
-        write_attribute(acpk, records.map(&:read_attribute).compact)
-      end
-    end
-
-    ::ActiveRecord::Base.singleton_class.prepend(AutosaveAssociation::ClassMethods)
-    ::ActiveRecord::Base.include(AutosaveAssociation)
-  end
-end