dynamic_migrations 3.6.13 → 3.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ecc60f6bad6a321991985b6e7cfd024486ec79caa1b49b143caf3c844d28275
-  data.tar.gz: b16c5bb261de851a877d4b6e6067b2767badf82f895ce25e0816286d11ef83e8
+  metadata.gz: 2a53664f8e85f6f7570b65b756687db445a71c5e48cdc7f52ab4a394570e9be5
+  data.tar.gz: 49cad85aaff8c311714a5e9c47c16708e8f6c3d7b6f276ce94d5b0dc8703eae6
 SHA512:
-  metadata.gz: 182c7cbc69b0ba406147e7e0d972887ec44d8171e00eb75b92a531702cd4abfaf18ab9c7e319ac7771f25696968582b56cf18fe275652f71f2426d1a1b6e363a
-  data.tar.gz: b0f0de5ca2c65380c25c80fe23c53942a576e4f4c9e7e3984d56dbf67d9afac6e2b16153f1d70012b7f0fb1dfd50b1b13e2cdebcf1c0333ea2cd86f90ded33df
+  metadata.gz: 03230e628a4b6b0719d12ffeecc68ba0395c405ae828232331195a319f2bfc394a00ba80f999ba68660392dede3a76d4656b749c991ba940332901c0a93cb771
+  data.tar.gz: 7b169d5836f5c6a53cfab698c3f8af30c397334bea5efb1087de0f9c33c481218955b90311715a75f96c124c9bd6306887713eddd5a218cbe375bedbd6dd5f31

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.6.14](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.13...v3.6.14) (2023-09-14)
+
+
+### Bug Fixes
+
+* allowing templates to return nil and skip adding to migrations ([3d90829](https://github.com/craigulliott/dynamic_migrations/commit/3d9082960403899b4243fde60629d9c83ce1e263))
+
 ## [3.6.13](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.12...v3.6.13) (2023-09-14)
 
 

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

@@ -33,13 +33,18 @@ module DynamicMigrations
 
             arguments = template_class.new(trigger, code_comment).fragment_arguments
 
-            # we only provide a dependent function if the function has more than one trigger
-            # or is in a different schema, otherwise it is added to the same migration as this
-            # trigger and we don't need to worry about dependencies
-            if trigger.function && (trigger.function.triggers.count > 1 || trigger.table.schema != trigger.function.schema)
-              add_fragment(dependent_function: trigger.function, **arguments)
-            else
-              add_fragment(**arguments)
+            # if the template class returns nil, then we skip the creation of this migration
+            # this is common for triggers where the template is respinsible for setting up
+            # multiple triggers (a mix of on update/insert and before/after etc.)
+            unless arguments.nil?
+              # we only provide a dependent function if the function has more than one trigger
+              # or is in a different schema, otherwise it is added to the same migration as this
+              # trigger and we don't need to worry about dependencies
+              if trigger.function && (trigger.function.triggers.count > 1 || trigger.table.schema != trigger.function.schema)
+                add_fragment(dependent_function: trigger.function, **arguments)
+              else
+                add_fragment(**arguments)
+              end
             end
 
           # no template, process this as a default trigger (takes all options)
@@ -124,8 +129,9 @@ module DynamicMigrations
         end
 
         def recreate_trigger original_trigger, updated_trigger
+          fragments = []
           # remove the original trigger
-          removal_fragment = remove_trigger original_trigger, <<~CODE_COMMENT
+          fragments << remove_trigger(original_trigger, <<~CODE_COMMENT)
             Removing original trigger because it has changed (it is recreated below)
             Changes:
               #{indent original_trigger.differences_descriptions(updated_trigger).join("\n")}
@@ -135,9 +141,10 @@ module DynamicMigrations
           recreation_fragment = add_trigger updated_trigger, <<~CODE_COMMENT
             Recreating this trigger
           CODE_COMMENT
+          fragments << recreation_fragment unless recreation_fragment.nil?
 
           # return the new fragments (the main reason to return them here is for the specs)
-          [removal_fragment, recreation_fragment]
+          fragments
         end
 
         # add a comment to a trigger

data/lib/dynamic_migrations/version.rb

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

data/sig/dynamic_migrations/postgres/generator/trigger.rbs

@@ -9,7 +9,7 @@ module DynamicMigrations
         def self.has_template?: (Symbol template_name) -> bool
         def self.add_template: (Symbol template_name, singleton(TriggerTemplateBase) template_class) -> void
 
-        def add_trigger: (Server::Database::Schema::Table::Trigger trigger, ?String? code_comment) -> Fragment
+        def add_trigger: (Server::Database::Schema::Table::Trigger trigger, ?String? code_comment) -> Fragment?
         def remove_trigger: (Server::Database::Schema::Table::Trigger trigger, ?String? code_comment) -> Fragment
         def recreate_trigger: (Server::Database::Schema::Table::Trigger original_trigger, Server::Database::Schema::Table::Trigger updated_trigger) -> Array[Fragment]
         def set_trigger_comment: (Postgres::Server::Database::Schema::Table::Trigger trigger, ?String? code_comment) -> Fragment

metadata

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