dynamic_migrations 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5f6a69d0ef49c88c5d4f7d1f3798e6a4272fccdad5e3e1c2f5887cf43e552a9
-  data.tar.gz: c3faf73058b222ac2a7b10006022d8a08e8b311efad48481f3b64e204b0b3c33
+  metadata.gz: b60f89c7a66fe00d71581049f4886a5baa6ca89255dbb47315637bfa6fc5d9be
+  data.tar.gz: cde91d7188a94a3443c8331c6efa9e966a8e86fee236fb156adc577cfebbc156
 SHA512:
-  metadata.gz: 1be6d466691eaf92f8b999de32a400cb1e14067618cb9ffe429275110675a516aa2797bc3368ce1d0a4aa66d4021044555cc2e54cb31d1a7290f89b72ae93ce4
-  data.tar.gz: 851125f34e2df74a7457d620372321a011459777a30543775eebdda6fcaf7c0cfe5b66e41b1c118bf4d6a029c4f99c8f99150032fa03fc97c18fa3656cd84c54
+  metadata.gz: 2a047c9a0d916de3bd28cd8bf41cbb91d7603eb562d68a5e5a9c099a1418d25a9756787ed735fe0badd8de712418366567b3af65cb86cf1c6b3c3898390c8415
+  data.tar.gz: 6ff07ad81f425dc6c2804e4dc38c36ee4122ff89b449fa9c98065213ca2730f0cf3f4e3c014f465482835c54d6d3f52453a0e0b463a694517b6c0c039e0bb3e9

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.6.3](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.2...v3.6.3) (2023-09-13)
+
+
+### Bug Fixes
+
+* passing correct type when generating column migrations ([e345d56](https://github.com/craigulliott/dynamic_migrations/commit/e345d56cdb11bb965c71c251d82ce2087b416f47))
+
+## [3.6.2](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.1...v3.6.2) (2023-09-13)
+
+
+### Bug Fixes
+
+* don't generate columns separately for migrations if also generating the table (as they are already included in the table definition) ([b6f748c](https://github.com/craigulliott/dynamic_migrations/commit/b6f748c8e72aaab12d32243f6a007d03707041da))
+
 ## [3.6.1](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.0...v3.6.1) (2023-09-13)
 
 

data/lib/dynamic_migrations/postgres/generator/column.rb

@@ -32,9 +32,17 @@ module DynamicMigrations
 
           options_syntax = options.map { |k, v| "#{k}: #{v}" }.join(", ")
 
-          data_type = column.data_type
+          data_type = column.data_type.to_s
+          # if it's an array, then we need to remove the [] from the end
           if column.array?
-            data_type = "\"#{data_type}\""
+            data_type = data_type.sub(/\[\]\z/, "")
+          end
+          # if its a custom type (has special characters) then we need to quote it
+          # otherwise, present it as a symbol
+          data_type = if data_type.match?(/\A\w+\z/)
+            ":#{data_type}"
+          else
+            "\"#{data_type}\""
           end
 
           add_fragment schema: column.table.schema,
@@ -43,7 +51,7 @@ module DynamicMigrations
             object: column,
             code_comment: code_comment,
             migration: <<~RUBY
-              add_column :#{column.table.name}, :#{column.name}, :#{data_type}, #{options_syntax}
+              add_column :#{column.table.name}, :#{column.name}, #{data_type}, #{options_syntax}
             RUBY
         end
 

data/lib/dynamic_migrations/postgres/generator/table.rb

@@ -88,6 +88,10 @@ module DynamicMigrations
             options = {}
             options[:null] = column.null
 
+            if column.array?
+              options[:array] = true
+            end
+
             unless column.default.nil?
               options[:default] = "\"#{column.default}\""
             end
@@ -103,7 +107,20 @@ module DynamicMigrations
 
             options_syntax = options.map { |k, v| "#{k}: #{v}" }.join(", ")
 
-            lines << "t.#{column.data_type} :#{column.name}, #{options_syntax}"
+            data_type = column.data_type.to_s
+            # if it's an array, then we need to remove the [] from the end
+            if column.array?
+              data_type = data_type.sub(/\[\]\z/, "")
+            end
+            # if its a custom type (has special characters) then we need to quote it
+            # otherwise, present it as a symbol
+            data_type = if data_type.match?(/\A\w+\z/)
+              ":#{data_type}"
+            else
+              "\"#{data_type}\""
+            end
+
+            lines << "t.column #{data_type}, :#{column.name}, #{options_syntax}"
           end
 
           if timestamps.any?

data/lib/dynamic_migrations/postgres/server/database/differences/to_migrations/schemas/tables.rb

@@ -26,7 +26,7 @@ module DynamicMigrations
 
                     # we process everything else after we create the table, because the other
                     # database objects are dependent on the table
-                    process_dependents schema_name, table_name, configuration_table, {}
+                    process_dependents schema_name, table_name, configuration_table, {}, skip_columns: true
 
                   # If the schema exists in the database but not in the configuration
                   # then we need to delete it.
@@ -60,8 +60,11 @@ module DynamicMigrations
                   end
                 end
 
-                def process_dependents schema_name, table_name, configuration_table, database_table
-                  process_columns schema_name, table_name, configuration_table[:columns] || {}, database_table[:columns] || {}
+                def process_dependents schema_name, table_name, configuration_table, database_table, skip_columns: false
+                  # we skip columns if we are processing the table for the first time, as they are processed within the table creation
+                  unless skip_columns
+                    process_columns schema_name, table_name, configuration_table[:columns] || {}, database_table[:columns] || {}
+                  end
                   process_foreign_key_constraints schema_name, table_name, configuration_table[:foreign_key_constraints] || {}, database_table[:foreign_key_constraints] || {}
                   process_indexes schema_name, table_name, configuration_table[:indexes] || {}, database_table[:indexes] || {}
                   process_triggers schema_name, table_name, configuration_table[:triggers] || {}, database_table[:triggers] || {}

data/lib/dynamic_migrations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicMigrations
-  VERSION = "3.6.1"
+  VERSION = "3.6.3"
 end

data/sig/dynamic_migrations/postgres/server/database/differences/to_migrations/schemas/tables.rbs

@@ -14,7 +14,7 @@ module DynamicMigrations
                 def process_tables: (Symbol schema_name, untyped configuration_tables, untyped database_tables) -> void
                 def process_table: (Symbol schema_name, Symbol table_name, untyped configuration_table, untyped database_table) -> void
                 # this method comes from the Columns module
-                def process_dependents: (Symbol schema_name, Symbol table_name, untyped configuration_columns, untyped database_columns) -> void
+                def process_dependents: (Symbol schema_name, Symbol table_name, untyped configuration_columns, untyped database_columns, ?skip_columns: bool) -> void
                 def process_columns: (Symbol schema_name, Symbol table_name, untyped configuration_columns, untyped database_columns) -> void
                 def process_foreign_key_constraints: (Symbol schema_name, Symbol table_name, untyped configuration_foreign_key_constraints, untyped database_foreign_key_constraints) -> void
                 def process_indexes: (Symbol schema_name, Symbol table_name, untyped configuration_indexes, untyped database_indexes) -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_migrations
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.3
 platform: ruby
 authors:
 - Craig Ulliott