dynamic_migrations 3.6.3 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b60f89c7a66fe00d71581049f4886a5baa6ca89255dbb47315637bfa6fc5d9be
-  data.tar.gz: cde91d7188a94a3443c8331c6efa9e966a8e86fee236fb156adc577cfebbc156
+  metadata.gz: 2fc1e5f220706376e73d84dc6f78acbb549f745a45c70d89e8335f540e44ef5f
+  data.tar.gz: 5532ce24fbcc66d9d0eeb765b686f303af60e871ae371437953d88170ea51898
 SHA512:
-  metadata.gz: 2a047c9a0d916de3bd28cd8bf41cbb91d7603eb562d68a5e5a9c099a1418d25a9756787ed735fe0badd8de712418366567b3af65cb86cf1c6b3c3898390c8415
-  data.tar.gz: 6ff07ad81f425dc6c2804e4dc38c36ee4122ff89b449fa9c98065213ca2730f0cf3f4e3c014f465482835c54d6d3f52453a0e0b463a694517b6c0c039e0bb3e9
+  metadata.gz: 4bf89b66978b604919aaf1892df850a8679d611d4052ec904970fd0859879fefb3ae0878159243af80ec4b2484207a29f74248a44487baa3c27fafa6b5c51cba
+  data.tar.gz: 367a8f6fff5a9a5e869c8720e662745d755972e225e0145001b4126856c45e2ad75e9e783a2277590932abac2b39db42305abed509dda51c7c0dbed4a4e85d7b

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.6.5](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.4...v3.6.5) (2023-09-13)
+
+
+### Bug Fixes
+
+* setting current schema on the migration class instead of the shared module ([28bc2ca](https://github.com/craigulliott/dynamic_migrations/commit/28bc2ca454883696665804c8596fc3b19ce31bb4))
+
+## [3.6.4](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.3...v3.6.4) (2023-09-13)
+
+
+### Bug Fixes
+
+* using active records standard disable/enable_extension, and create/drop schema methods ([4a73e5c](https://github.com/craigulliott/dynamic_migrations/commit/4a73e5c2d6642bdd9c5f61164a044bbed9032da9))
+
 ## [3.6.3](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.2...v3.6.3) (2023-09-13)
 
 

data/lib/dynamic_migrations/active_record/migrators.rb

@@ -21,7 +21,6 @@ module DynamicMigrations
       class MissingFunctionBlockError < StandardError
       end
 
-      include Schema
       include Validation
       include ForeignKeyConstraint
       include Table
@@ -32,19 +31,24 @@ module DynamicMigrations
       include Trigger
       include Enum
 
-      # The schema name should be set before the migrations for
-      # each schema's migrations are run. This is done by:
-      # DynamicMigrations::ActiveRecord::Migrators.set_schema_name :schema_name
-      def self.schema_name
-        @current_schema
+      def self.included(base)
+        base.extend(ClassMethods)
       end
 
-      def self.set_schema_name schema_name
-        @current_schema = schema_name.to_sym
-      end
+      module ClassMethods
+        # The schema name should be set on the migration class before the migration
+        # is run
+        def schema_name
+          @current_schema
+        end
 
-      def self.clear_schema_name
-        @current_schema = nil
+        def set_schema_name schema_name
+          @current_schema = schema_name.to_sym
+        end
+
+        def clear_schema_name
+          @current_schema = nil
+        end
       end
 
       def quote string
@@ -53,7 +57,7 @@ module DynamicMigrations
 
       # this method is made available on the final migration class
       def schema_name
-        sn = Migrators.schema_name
+        sn = self.class.schema_name
         if sn.nil?
           raise SchemaNameNotSetError
         end

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

@@ -6,8 +6,10 @@ module DynamicMigrations
         # note that removals come before additions, and that the order here optomizes
         # for dependencies (i.e. columns have to be created before indexes are added and
         # triggers are removed before functions are dropped)
-        add_structure_template [:create_extension], "Create Extension"
-        add_structure_template [:drop_extension], "Drop Extension"
+        add_structure_template [:disable_extension], "Drop Extension"
+        add_structure_template [:enable_extension], "Create Extension"
+        add_structure_template [:drop_schema], "Drop this schema"
+        add_structure_template [:create_schema], "Create this schema"
       end
     end
   end

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

@@ -2,23 +2,23 @@ module DynamicMigrations
   module Postgres
     class Generator
       module Extension
-        def create_extension extension_name, code_comment = nil
+        def enable_extension extension_name, code_comment = nil
           # no table or schema name for this fragment (it is executed at the database level)
-          add_fragment migration_method: :create_extension,
+          add_fragment migration_method: :enable_extension,
             object: extension_name,
             code_comment: code_comment,
             migration: <<~RUBY
-              create_extension "#{extension_name}"
+              enable_extension "#{extension_name}"
             RUBY
         end
 
-        def drop_extension extension_name, code_comment = nil
+        def disable_extension extension_name, code_comment = nil
           # no table or schema name for this fragment (it is executed at the database level)
-          add_fragment migration_method: :drop_extension,
+          add_fragment migration_method: :disable_extension,
             object: extension_name,
             code_comment: code_comment,
             migration: <<~RUBY
-              drop_extension "#{extension_name}"
+              disable_extension "#{extension_name}"
             RUBY
         end
       end

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

@@ -144,10 +144,10 @@ module DynamicMigrations
           raise NoFragmentsError if fragments.empty?
 
           if fragments_for_method? :create_schema
-            :"create_#{first_fragment_using_migration_method(:create_schema).schema_name}_schema"
+            :"create_#{fragments.first&.object_name}_schema"
 
           elsif fragments_for_method? :drop_schema
-            :"drop_#{first_fragment_using_migration_method(:drop_schema).schema_name}_schema"
+            :"drop_#{fragments.first&.object_name}_schema"
 
           elsif fragments_for_method? :create_table
             :"create_#{first_fragment_using_migration_method(:create_table).table_name}"
@@ -164,11 +164,11 @@ module DynamicMigrations
           elsif all_fragments_for_method? [:create_enum, :add_enum_values, :drop_enum, :set_enum_comment, :remove_enum_comment]
             :enums
 
-          elsif all_fragments_for_method? [:create_extension]
-            (@fragments.count > 1) ? :create_extensions : :"create_#{fragments.first&.object_name}_extension"
+          elsif all_fragments_for_method? [:enable_extension]
+            (@fragments.count > 1) ? :enable_extensions : :"create_#{fragments.first&.object_name}_extension"
 
-          elsif all_fragments_for_method? [:drop_extension]
-            (@fragments.count > 1) ? :drop_extensions : :"drop_#{fragments.first&.object_name}_extension"
+          elsif all_fragments_for_method? [:disable_extension]
+            (@fragments.count > 1) ? :disable_extensions : :"drop_#{fragments.first&.object_name}_extension"
 
           elsif @fragments.first&.table_name
             :"changes_for_#{@fragments.first&.table_name}"

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

@@ -3,8 +3,8 @@ module DynamicMigrations
     class Generator
       module Schema
         def create_schema schema, code_comment = nil
-          add_fragment schema: schema,
-            migration_method: :create_schema,
+          # no table or schema name for this fragment (it is executed at the database level)
+          add_fragment migration_method: :create_schema,
             object: schema,
             code_comment: code_comment,
             migration: <<~RUBY
@@ -13,8 +13,8 @@ module DynamicMigrations
         end
 
         def drop_schema schema, code_comment = nil
-          add_fragment schema: schema,
-            migration_method: :drop_schema,
+          # no table or schema name for this fragment (it is executed at the database level)
+          add_fragment migration_method: :drop_schema,
             object: schema,
             code_comment: code_comment,
             migration: <<~RUBY

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

@@ -8,12 +8,9 @@ module DynamicMigrations
         # triggers are removed before functions are dropped)
         add_structure_template [:remove_function_comment, :drop_function], "Remove Functions"
         add_structure_template [:remove_enum_comment, :drop_enum], "Drop Enums"
-        add_structure_template [:drop_schema], "Drop this schema"
         add_structure_template [:create_enum, :add_enum_values, :set_enum_comment], "Enums"
-        add_structure_template [:create_schema], "Create this schema"
         add_structure_template [:create_function], "Functions"
         add_structure_template [:update_function, :set_function_comment], "Update Functions"
-        add_structure_template [:create_extension, :drop_extension], "Extensions"
 
         def initialize schema_name
           raise MissingRequiredSchemaName unless schema_name

data/lib/dynamic_migrations/postgres/generator.rb

@@ -72,10 +72,11 @@ module DynamicMigrations
             schema_migration = schema_migrations[:schema_migration] ||= SchemaMigration.new(schema_name)
             schema_migration.add_fragment fragment
 
-            # migrations with no schema or table, are added to a database
-            # migration (these re really just creating/dropping extensions)
+          # migrations with no schema or table, are added to a database
+          # migration (these are really just creating/dropping schemas and extensions)
           elsif schema_name.nil? && table_name.nil?
             database_specific_migration.add_fragment fragment
+
           else
             raise UnprocessableFragmentError
           end

data/lib/dynamic_migrations/postgres/server/database/differences/to_migrations/extensions.rb

@@ -12,13 +12,13 @@ module DynamicMigrations
                 # then we have to create it
                 if configuration_extension[:exists] == true && !database_extension[:exists]
                   # a migration to create the extension
-                  @generator.create_extension extension_name
+                  @generator.enable_extension extension_name
 
                 # if the extension exists in the database but not in the configuration
                 # then we need to delete it
                 elsif database_extension[:exists] == true && !configuration_extension[:exists]
                   # a migration to drop the extension
-                  @generator.drop_extension extension_name
+                  @generator.disable_extension extension_name
                 end
               end
             end

data/lib/dynamic_migrations/version.rb

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

data/lib/dynamic_migrations.rb

@@ -87,7 +87,6 @@ require "dynamic_migrations/postgres/generator/schema_migration"
 require "dynamic_migrations/postgres/generator/table_migration"
 require "dynamic_migrations/postgres/generator/migration_dependency_sorter"
 
-require "dynamic_migrations/active_record/migrators/schema"
 require "dynamic_migrations/active_record/migrators/validation"
 require "dynamic_migrations/active_record/migrators/foreign_key_constraint"
 require "dynamic_migrations/active_record/migrators/unique_constraint"

data/sig/dynamic_migrations/active_record/migrators.rbs

@@ -1,12 +1,6 @@
-# TypeProf 0.21.7
-
-# Classes
 module DynamicMigrations
   module ActiveRecord
     module Migrators
-      self.@current_schema: nil
-
-      include Schema
       include Validation
       include ForeignKeyConstraint
       include Column
@@ -15,11 +9,10 @@ module DynamicMigrations
       include Function
       include Trigger
 
-      def self.schema_name: -> nil
-      def self.set_schema_name: (untyped schema_name) -> untyped
-      def self.clear_schema_name: -> nil
-      def self.included: (untyped klass) -> untyped
-      def schema_name: -> nil
+      def self.included: (untyped base) -> void
+      def quote: (untyped string) -> String
+      def schema_name: -> Symbol
+      def self.schema_name: -> Symbol
 
       # this methods comes from active record once the module has been included
       def connection: -> untyped
@@ -32,6 +25,14 @@ module DynamicMigrations
 
       class MissingFunctionBlockError < StandardError
       end
+
+      module ClassMethods
+        @current_schema: Symbol?
+
+        def schema_name: -> Symbol?
+        def set_schema_name: (untyped schema_name) -> void
+        def clear_schema_name: -> void
+      end
     end
   end
 end

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

@@ -5,8 +5,8 @@ module DynamicMigrations
   module Postgres
     class Generator
       module Extension
-        def create_extension: (Symbol extension_name, ?String? code_comment) -> Fragment
-        def drop_extension: (Symbol extension_name, ?String? code_comment) -> Fragment
+        def enable_extension: (Symbol extension_name, ?String? code_comment) -> Fragment
+        def disable_extension: (Symbol extension_name, ?String? code_comment) -> Fragment
 
         # these come from the generator object (which this module is included into)
         def add_fragment: (migration_method: Symbol, object: untyped, migration: String, ?schema: Server::Database::Schema?, ?table: Server::Database::Schema::Table?, ?code_comment: String?, ?dependent_table: Server::Database::Schema::Table?) -> untyped

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_migrations
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.5
 platform: ruby
 authors:
 - Craig Ulliott
@@ -71,7 +71,6 @@ files:
 - lib/dynamic_migrations/active_record/migrators/foreign_key_constraint.rb
 - lib/dynamic_migrations/active_record/migrators/function.rb
 - lib/dynamic_migrations/active_record/migrators/index.rb
-- lib/dynamic_migrations/active_record/migrators/schema.rb
 - lib/dynamic_migrations/active_record/migrators/table.rb
 - lib/dynamic_migrations/active_record/migrators/trigger.rb
 - lib/dynamic_migrations/active_record/migrators/unique_constraint.rb
@@ -163,7 +162,6 @@ files:
 - sig/dynamic_migrations/active_record/migrators/foreign_key_constraint.rbs
 - sig/dynamic_migrations/active_record/migrators/function.rbs
 - sig/dynamic_migrations/active_record/migrators/index.rbs
-- sig/dynamic_migrations/active_record/migrators/schema.rbs
 - sig/dynamic_migrations/active_record/migrators/table.rbs
 - sig/dynamic_migrations/active_record/migrators/trigger.rbs
 - sig/dynamic_migrations/active_record/migrators/unique_constraint.rbs

data/lib/dynamic_migrations/active_record/migrators/schema.rb

@@ -1,21 +0,0 @@
-module DynamicMigrations
-  module ActiveRecord
-    module Migrators
-      module Schema
-        def create_schema
-          # schema_name was not provided to this method, it comes from the migration class
-          execute <<~SQL
-            CREATE SCHEMA #{schema_name};
-          SQL
-        end
-
-        def drop_schema
-          # schema_name was not provided to this method, it comes from the migration class
-          execute <<~SQL
-            DROP SCHEMA #{schema_name};
-          SQL
-        end
-      end
-    end
-  end
-end

data/sig/dynamic_migrations/active_record/migrators/schema.rbs

@@ -1,17 +0,0 @@
-# TypeProf 0.21.7
-
-# Classes
-module DynamicMigrations
-  module ActiveRecord
-    module Migrators
-      module Schema
-        def create_schema: () -> void
-        def drop_schema: () -> void
-
-        # stubbing these out, as they are available on the module which includes this module
-        def execute: (String sql) -> void
-        def schema_name: () -> Symbol
-      end
-    end
-  end
-end