torque-postgresql 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c677b1f2b2cdf150a4e8e9a817cd7a9a6e46680a353c3125aeb7ab65e1b85348
-  data.tar.gz: 72a25a13491d9349a813484be40c43cacc767355060ba16375da7b7f41739249
+  metadata.gz: f08898e4218d41dbcc6394500243760cdd29425ad77135a623bea043cfa8d3ae
+  data.tar.gz: 93c5d71e1597364b7e434e6c88faf4cfd64dcbc930756398f7539dc525a21f05
 SHA512:
-  metadata.gz: 1b6bdeeb8ca02a6027a79fc0d896716603792c1d4cee95131995ef944075f13b983a583a22eb4e3b6b590b8430b7b4eb4469522cf76b47daa30b8c2dd35a7318
-  data.tar.gz: eca4f269833a0823442f247cb065f14fe412c85063e5df8e751a20a366fd296f02db3ad2720b02d7a4169c73b38c1bbfe29160f292671a8a5cf0a23b4ffa9261
+  metadata.gz: c7f93afd26ff711ba03f5a5b1381a139690acf8d3a5621ddec1d26a94ae345c2a59e06cdd9805a5101b4d81f51c151ea0fd19bba7a66d080d05387b073cfd55a
+  data.tar.gz: 5db371506b24fe1c5e28aee69054a83724af93642f44cd3646f6aa9ff9bd58b7a2d2632a186762dca570e2adb0ceea1c38cec5d0119b8f0e4e882b4089913895

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

@@ -194,23 +194,21 @@ 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:
-          # Only affects inheritance
-          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,
+                    #{supports_virtual_columns? ? 'attgenerated' : quote('')} as attgenerated
+              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

@@ -112,6 +112,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/config.rb

@@ -59,11 +59,11 @@ module Torque
       # arguments to format string or send on a proc
       cte.send_arguments_key = :args
 
-      # Estipulate a class name (which may contain namespace) that expose the
+      # Estipulate a class name (which may contain namespace) that exposes the
       # auxiliary statement in order to perform detached CTEs
       cte.exposed_class = 'TorqueCTE'
 
-      # Estipulate a class name (which may contain namespace) that expose the
+      # Estipulate a class name (which may contain namespace) that exposes the
       # recursive auxiliary statement in order to perform detached CTEs
       cte.exposed_recursive_class = 'TorqueRecursiveCTE'
 

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '3.2.0'
+    VERSION = '3.2.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: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Carlos Silva
 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