torque-postgresql 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51c2e056f8b1a5bfa52339dbc7212a03fdd7f99f7fa05b11d066859ef1763f45
-  data.tar.gz: 6b0cdc4ac793d578cc925363f331f167c80a73a1d708f68c98b2d8430b21331f
+  metadata.gz: 0e36ced2b0986c132e095bbc1799e4fab1f7bd6f320e83d74f8387c9ad23b798
+  data.tar.gz: 4807f5dc5146805a349a5495829e0b4aac83df495982b08a35c9c593d8323d42
 SHA512:
-  metadata.gz: fd702676e2677393a1002c411380cb297f7f56b7f2bdad7317a446849accf3090b9dcd27d6b2e50b7e7c81d6299db97f3fbd190a6c21d6afca9782c575e900ba
-  data.tar.gz: 74cbc3c504fad7ebd55249ed4339c7a2571320828faebe7a2f573b759e721febd07e05c5227759748dbde4c0e629521d167d149e65339cd3a0be855f60076b29
+  metadata.gz: 84cc6db0f08fcb8c6d0616784382f77ebca1440a396df0a06efa7c2b0e1e0ac6685d54c4b4f6ac5163a7ba42cbeb4b2f81fcb197e4836d894819e0f76d9545c4
+  data.tar.gz: 3624ca914923f61c0bf23a7eed17c8c7d71270b8d0853d3d1445b7a1e513a97d066d8a7041111e504a7b1e6aaaab391cc2502d8fb42e69052c46b97377f4dfb4

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

@@ -185,21 +185,20 @@ module Torque
 
         # Get the list of columns, and their definition, but only from the
         # actual table, does not include columns that comes from inherited table
-        def column_definitions(table_name) # :nodoc:
-          local_condition = 'AND a.attislocal IS TRUE' if @_dump_mode
+        def column_definitions(table_name)
+          local = 'AND a.attislocal' if @_dump_mode
+
           query(<<-SQL, 'SCHEMA')
-              SELECT a.attname, format_type(a.atttypid, a.atttypmod),
-                     pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod,
-             (SELECT c.collname FROM pg_collation c, pg_type t
-               WHERE c.oid = a.attcollation AND t.oid = a.atttypid AND a.attcollation <> t.typcollation),
-                     col_description(a.attrelid, a.attnum) AS comment
-                FROM pg_attribute a
-           LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
-               WHERE a.attrelid = '#{quote_table_name(table_name)}'::regclass
-                 AND a.attnum > 0
-                 AND a.attisdropped IS FALSE
-                 #{local_condition}
-               ORDER BY a.attnum
+            SELECT a.attname, format_type(a.atttypid, a.atttypmod),
+                    pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod,
+                    c.collname, col_description(a.attrelid, a.attnum) AS comment
+              FROM pg_attribute a
+              LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+              LEFT JOIN pg_type t ON a.atttypid = t.oid
+              LEFT JOIN pg_collation c ON a.attcollation = c.oid AND a.attcollation <> t.typcollation
+              WHERE a.attrelid = #{quote(quote_table_name(table_name))}::regclass
+                AND a.attnum > 0 AND NOT a.attisdropped #{local}
+              ORDER BY a.attnum
           SQL
         end
 

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

@@ -127,6 +127,11 @@ module Torque
 
         private
 
+          # Remove the schema from the sequence name
+          def sequence_name_from_parts(table_name, column_name, suffix)
+            super(table_name.split('.').last, column_name, suffix)
+          end
+
           def quote_enum_values(name, values, options)
             prefix = options[:prefix]
             prefix = name if prefix === true

data/lib/torque/postgresql/version.rb

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

data/spec/tests/schema_spec.rb

@@ -73,6 +73,15 @@ RSpec.describe 'Schema' do
         expect(dump_result).to match /create_table \"users\",.*schema: +"internal"/
       end
     end
+
+    it 'does not affect serial ids' do
+      connection.create_table(:primary_keys, id: :serial) do |t|
+        t.string :title
+      end
+
+      parts = '"primary_keys", id: :serial, force: :cascade'
+      expect(dump_result).to match(/create_table #{parts} do /)
+    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.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Carlos Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,22 +108,22 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +299,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
@@ -316,60 +316,60 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
 test_files:
 - spec/en.yml
 - spec/factories/authors.rb
 - spec/factories/comments.rb
+- spec/factories/item.rb
 - spec/factories/posts.rb
 - spec/factories/tags.rb
 - spec/factories/texts.rb
 - spec/factories/users.rb
 - spec/factories/videos.rb
-- spec/factories/item.rb
 - spec/mocks/cache_query.rb
 - 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/category.rb
 - spec/models/comment.rb
 - spec/models/course.rb
 - spec/models/geometry.rb
 - spec/models/guest_comment.rb
+- spec/models/internal/user.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/item.rb
-- spec/models/question.rb
-- spec/models/question_select.rb
-- spec/models/internal/user.rb
-- spec/models/category.rb
+- spec/schema.rb
+- spec/spec_helper.rb
+- spec/tests/arel_spec.rb
+- spec/tests/auxiliary_statement_spec.rb
+- spec/tests/belongs_to_many_spec.rb
 - spec/tests/collector_spec.rb
 - spec/tests/distinct_on_spec.rb
+- spec/tests/enum_set_spec.rb
+- spec/tests/enum_spec.rb
 - spec/tests/geometric_builder_spec.rb
-- spec/tests/lazy_spec.rb
-- spec/tests/quoting_spec.rb
-- spec/tests/relation_spec.rb
-- spec/tests/belongs_to_many_spec.rb
-- spec/tests/range_spec.rb
+- spec/tests/has_many_spec.rb
 - spec/tests/insert_all_spec.rb
-- spec/tests/enum_set_spec.rb
-- spec/tests/auxiliary_statement_spec.rb
 - spec/tests/interval_spec.rb
+- spec/tests/lazy_spec.rb
 - spec/tests/period_spec.rb
+- spec/tests/quoting_spec.rb
+- spec/tests/range_spec.rb
+- spec/tests/relation_spec.rb
 - spec/tests/schema_spec.rb
 - spec/tests/table_inheritance_spec.rb
-- spec/tests/arel_spec.rb
-- spec/tests/enum_spec.rb
-- spec/tests/has_many_spec.rb
-- spec/spec_helper.rb
-- spec/schema.rb