dynamic_migrations 3.6.2 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a237bb66c7567c302f4f01ada5c06be36187234cd430da63a753eac9c3c0320
-  data.tar.gz: ab87c5f523b6a682a4e6b648b050e609fe1bfca14bcf1fdebd813b04a5f5091b
+  metadata.gz: ffc5194d0e153bdd70a23f5e5b83a3b916d06f1f0b27ea044f9dfab6ef0faa8f
+  data.tar.gz: 901bf23a5e92dfd68bc45fea4945aa7ac2930b4d7c2d1217196d3b16228076b2
 SHA512:
-  metadata.gz: 94080c180556da70c9bba292ec6de10de980ed95ff71705c14b320a56b507eae50cccbc1654354184406bce6386b03bde27afdae2615c8060818f8ab5f876bc1
-  data.tar.gz: e1800b2c149556be65affbf35321abd7f50282efe54dcb33af379cc24ea493c7c72663eff1b7e4379eef4ac8eb852b5a36f8532f844ebc7eadb6784b495e62ff
+  metadata.gz: 464de1cbaffead85f9be5bb65c0146984d78c607a95d3ea2ba33293966eb5065f1542867b8667364388e54a06d50a8062919dc512324001b23d1f2fcd4e0ad62
+  data.tar.gz: 5d30a1b918c09e6d5206e1dd0c0c4963f0b23c0a92b4282c306b9465ed5825f3f0e321c76c274eaa4f465a6f02e907ec1864320ef26f9793e812e9bd0abaea82

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
+
+
+### 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)
 
 

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

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/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/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/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.2"
+  VERSION = "3.6.4"
 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

@@ -6,7 +6,6 @@ module DynamicMigrations
     module Migrators
       self.@current_schema: nil
 
-      include Schema
       include Validation
       include ForeignKeyConstraint
       include Column

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.2
+  version: 3.6.4
 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