dynamic_migrations 3.6.15 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1f731ee879fc2da123605b8cb10c5dee47ff16a065dd043be4ec4424ceba90
-  data.tar.gz: ee8925da339476c44a54440240d4736b443ae671075d6f9791033052ef542da3
+  metadata.gz: 22fd29f59924e820da26858d1cf6caf04b03985ecc2fafd5f49205f5a0c2b34e
+  data.tar.gz: a8164cec22385ede8954df04e86c866bdb9d1ae4d420ba9107353f96e1a525e8
 SHA512:
-  metadata.gz: 841a16d865fc252e0c7ea85b589d0de86703c1d718ba05fd695852daff12117e6dbbfd7ccb22e7f29659253e8193054dccca635423ccd9ea0dc7875482606cb8
-  data.tar.gz: 16ffa1cffc44cf979247738466a5884db216042f82b945b4936e0f1beca4d04b4544f71b4912e65a1b2e5581d8ffb5c4b2d288a55198eaf6dfdcad04372b10b6
+  metadata.gz: ec4eb2339d1ce110393eae8747c9e2aabee426d58a4e3caca8e01b7dd48ddfe99291ab903c9c7ba2e474a8b509a7185850132c1934f512c8ebe710e763243ba9
+  data.tar.gz: 50076bbed1405f301476ac49f0886207f9fde401c47af062fafa4095139cd3287699b8054cac4583b97422180f8fb3be935d94ac87b1ccd071a293972811eec7

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [3.7.0](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.16...v3.7.0) (2023-09-27)
+
+
+### Features
+
+* providing access to foreign key constraints from both sides of the association ([48dcf1c](https://github.com/craigulliott/dynamic_migrations/commit/48dcf1cd4cdb23bc37da3e47b00f8007b8bc0f8a))
+
+
+### Bug Fixes
+
+* allowing foreign keys to the same table because they are valid and sometimes useful ([0566384](https://github.com/craigulliott/dynamic_migrations/commit/0566384a4cfeade757d9806059035477f7c41ee2))
+* lazy loading column names for validations when they were configured with a nil value for columns ([439200e](https://github.com/craigulliott/dynamic_migrations/commit/439200efdedf74dddc852bf9bd35e81c1f6b4336))
+* providing convenience method to retrieve columns base data type from array columns ([cd3d9bf](https://github.com/craigulliott/dynamic_migrations/commit/cd3d9bf06682335a890d9b11133d397d7bcd50af))
+* semi colon at the end of function definitions is now optional ([ca9b3aa](https://github.com/craigulliott/dynamic_migrations/commit/ca9b3aa04da23605ff61b2ec14baed927145d2c3))
+* structure loader was not identifying enums properly ([95276d3](https://github.com/craigulliott/dynamic_migrations/commit/95276d33f98f41eca9a9467bb6abeb458a37f16b))
+
+## [3.6.16](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.15...v3.6.16) (2023-09-16)
+
+
+### Bug Fixes
+
+* adding convenience method to call all three cache rebuild methods at once ([287a73d](https://github.com/craigulliott/dynamic_migrations/commit/287a73d96c4bfa303150e3c1f65cb514569c03b6))
+* allowing functions and triggers to be in different schemas ([6df3377](https://github.com/craigulliott/dynamic_migrations/commit/6df337780a9a6b6815776a1f65afd3c8325a00fd))
+* always sorting column names on validations so that they match the structure loader ([3e7e646](https://github.com/craigulliott/dynamic_migrations/commit/3e7e646e834140bcce74e357e6e84c3996b9525e))
+* corrected bug where we passed nil as trigger for updating trigger comment ([c7a3677](https://github.com/craigulliott/dynamic_migrations/commit/c7a3677694130125d581f8f68e56865644d5c442))
+* enum values should be strings not symbols ([080e5da](https://github.com/craigulliott/dynamic_migrations/commit/080e5daaeefa1504912e2cd4f3482af82890ee08))
+* fixed bug where constraint was duplicated due to pg check_constraints table allowing duplicates ([471b6f8](https://github.com/craigulliott/dynamic_migrations/commit/471b6f82fc01770e63f657a12d01d18011c69f07))
+* fixing whitespace with create table migrator syntax ([5bf1a7f](https://github.com/craigulliott/dynamic_migrations/commit/5bf1a7f9f337883ca677b1a2015dd0c41a27442c))
+* generating materialized views automatically when refreshing them but they don't yet exist ([471b6f8](https://github.com/craigulliott/dynamic_migrations/commit/471b6f82fc01770e63f657a12d01d18011c69f07))
+* handling default comments via templates ([3e7e646](https://github.com/craigulliott/dynamic_migrations/commit/3e7e646e834140bcce74e357e6e84c3996b9525e))
+* methods to refresh caches because this needs to be performed before and after migrations are generated and run ([ab72670](https://github.com/craigulliott/dynamic_migrations/commit/ab72670e5fc7d379aed86cf72be956cdc39ed620))
+* more strictly validating column types data types which use enums ([3e7e646](https://github.com/craigulliott/dynamic_migrations/commit/3e7e646e834140bcce74e357e6e84c3996b9525e))
+* removed code which was stripping empty lines from migrations, but inadvertently removing empty lines from within SQL statements ([3e7e646](https://github.com/craigulliott/dynamic_migrations/commit/3e7e646e834140bcce74e357e6e84c3996b9525e))
+* updating action order so that its sequential based on the event manipulation type (update, insert etc.) ([3e7e646](https://github.com/craigulliott/dynamic_migrations/commit/3e7e646e834140bcce74e357e6e84c3996b9525e))
+* validations should not end with a semicolon ([9e2cc8e](https://github.com/craigulliott/dynamic_migrations/commit/9e2cc8ebf1c6da8c4741c5257c6567fc9f3668a7))
+* various fixes after running a variety of real migrations from platformer ([301db01](https://github.com/craigulliott/dynamic_migrations/commit/301db01397f1cb16c6c0e08e9e8c69e1f3ec799e))
+
 ## [3.6.15](https://github.com/craigulliott/dynamic_migrations/compare/v3.6.14...v3.6.15) (2023-09-14)
 
 

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

@@ -0,0 +1,21 @@
+module DynamicMigrations
+  module ActiveRecord
+    module Migrators
+      module PrimaryKey
+        # add a comment to the primary_key
+        def set_primary_key_comment table_name, primary_key_name, comment
+          execute <<~SQL
+            COMMENT ON CONSTRAINT #{primary_key_name} ON #{schema_name}.#{table_name} IS #{quote comment};
+          SQL
+        end
+
+        # remove a primary_key comment
+        def remove_primary_key_comment table_name, primary_key_name
+          execute <<~SQL
+            COMMENT ON CONSTRAINT #{primary_key_name} ON #{schema_name}.#{table_name} IS NULL;
+          SQL
+        end
+      end
+    end
+  end
+end

data/lib/dynamic_migrations/active_record/migrators.rb

@@ -30,6 +30,7 @@ module DynamicMigrations
       include UniqueConstraint
       include Trigger
       include Enum
+      include PrimaryKey
 
       def self.included(base)
         base.extend(ClassMethods)

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

@@ -59,6 +59,38 @@ module DynamicMigrations
           # return the new fragments (the main reason to return them here is for the specs)
           [removal_fragment, recreation_fragment]
         end
+
+        # add a comment to a primary_key
+        def set_primary_key_comment primary_key, code_comment = nil
+          description = primary_key.description
+
+          if description.nil?
+            raise MissingDescriptionError, "Missing required description for primary_key `#{primary_key.name}` in table `#{primary_key.table.schema.name}.#{primary_key.table.name}`"
+          end
+
+          add_fragment schema: primary_key.table.schema,
+            table: primary_key.table,
+            migration_method: :set_primary_key_comment,
+            object: primary_key,
+            code_comment: code_comment,
+            migration: <<~RUBY
+              set_primary_key_comment :#{primary_key.table.name}, :#{primary_key.name}, <<~COMMENT
+                #{indent description}
+              COMMENT
+            RUBY
+        end
+
+        # remove the comment from a primary_key
+        def remove_primary_key_comment primary_key, code_comment = nil
+          add_fragment schema: primary_key.table.schema,
+            table: primary_key.table,
+            migration_method: :remove_primary_key_comment,
+            object: primary_key,
+            code_comment: code_comment,
+            migration: <<~RUBY
+              remove_primary_key_comment :#{primary_key.table.name}, :#{primary_key.name}
+            RUBY
+        end
       end
     end
   end

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

@@ -93,10 +93,20 @@ module DynamicMigrations
           lines = []
           timestamps = []
           columns.each do |column|
-            # skip the :id, as it is handled by the table_options method
-            next if column.name == :id
-            # skip the :created_at and :updated_at as they are handled below
+            # skip creating the :id column as it is handled by the table_options
+            # method, but add the comment if there is one
+            if column.name == :id
+              unless column.description.nil?
+                set_column_comment column
+              end
+              next
+            end
+            # skip creating the :created_at and :updated_at column as it is handled
+            # by the table_options method, but add the comments
             if column.name == :created_at || column.name == :updated_at
+              unless column.description.nil?
+                set_column_comment column
+              end
               timestamps << column.name
               next
             end
@@ -115,7 +125,7 @@ module DynamicMigrations
             if column.description.nil?
               raise NoTableColumnCommentError, "Refusing to generate create_table migration, no description was provided for `#{column.table.schema.name}`.`#{column.table.name}` column `#{column.name}`"
             end
-            options[:comment] = <<~RUBY
+            options[:comment] = <<~RUBY.strip
               <<~COMMENT
                 #{indent column.description}
               COMMENT
@@ -163,6 +173,12 @@ module DynamicMigrations
             elsif pk_column_names.count > 1
               options << "primary_key: [:#{pk_column_names.join(", :")}]"
             end
+
+            # if the primary key has a description, then add it seperately
+            if table.primary_key.description
+              set_primary_key_comment table.primary_key
+            end
+
           end
 
           options << "comment: table_comment"

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

@@ -17,7 +17,7 @@ module DynamicMigrations
         add_structure_template [:remove_table_comment, :set_table_comment], "Tables"
         add_structure_template [:add_column], "Additional Columns"
         add_structure_template [:change_column, :remove_column_comment, :set_column_comment], "Update Columns"
-        add_structure_template [:add_primary_key], "Primary Key"
+        add_structure_template [:add_primary_key, :set_primary_key_comment, :remove_primary_key_comment], "Primary Key"
         add_structure_template [:add_index, :set_index_comment], "Indexes"
         add_structure_template [:add_foreign_key, :set_foreign_key_constraint_comment, :remove_foreign_key_constraint_comment], "Foreign Keys"
         add_structure_template [:add_validation, :add_unique_constraint, :set_validation_comment, :remove_validation_comment, :set_unique_constraint_comment, :remove_unique_constraint_comment], "Validations"

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

@@ -57,10 +57,6 @@ module DynamicMigrations
             options_syntax = options.map { |k, v| "#{k}: #{v}" }.join(", ")
 
             validation_sql = validation.check_clause.strip
-            # ensure that the validation ends with a semicolon
-            unless validation_sql.end_with? ";"
-              validation_sql << ";"
-            end
 
             add_fragment schema: validation.table.schema,
               table: validation.table,

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

@@ -46,14 +46,16 @@ module DynamicMigrations
           matches[:value]
         end
 
-        def name_and_description_options_string default_name
+        def name_and_description_options_string default_name, default_comment = nil
           options = {}
           # we only need to provide a name if it is different than the default
           unless @validation.name == default_name
             options[:name] = @validation.name
           end
-          # only provide a comment if it is not nil
-          unless @validation.description.nil?
+          # only provide a comment if it is not nil and not equal to the provided
+          # default_comment, if it is the same as the default then we wont want to show
+          # it in the migration files
+          unless @validation.description.nil? || @validation.description == default_comment
             options[:comment] = <<~RUBY
               <<~COMMENT
                 #{indent @validation.description || ""}

data/lib/dynamic_migrations/postgres/generator.rb

@@ -243,9 +243,8 @@ module DynamicMigrations
       # This method is called from within the various modules which are included to this class.
       # It locally stores all the fragments which will later be organized into different migrations.
       def add_fragment migration_method:, object:, migration:, schema: nil, table: nil, code_comment: nil, dependent_table: nil, dependent_function: nil, dependent_enum: nil
-        # Remove any empty lines and whitespace from the beginning or the end of the migration and then
-        # strip any empty lines witin the migration (remove the whitespace from them, not delete them).
-        final_migration = strip_empty_lines(migration).strip
+        # Remove any empty lines and whitespace from the beginning or the end of the migration
+        final_migration = trim_lines migration
         fragment = Fragment.new(schema&.name, table&.name, migration_method, object.name, code_comment, final_migration)
 
         if dependent_table
@@ -272,8 +271,8 @@ module DynamicMigrations
         multi_line_string.gsub("\n", "\n#{spaces}")
       end
 
-      def strip_empty_lines multi_line_string
-        multi_line_string.gsub(/^\s*\n/, "")
+      def trim_lines string
+        string.split("\n").map(&:rstrip).join("\n")
       end
     end
   end

data/lib/dynamic_migrations/postgres/server/database/connection.rb

@@ -42,10 +42,12 @@ module DynamicMigrations
             # perform work with the connection
             # todo: `yield connection` would have been preferred, but rbs/steep doesnt understand that syntax
             if block.is_a? Proc
-              block.call connection
+              result = block.call connection
             end
             # close the connection
             disconnect
+            # return whever was returned from within the block
+            result
           end
         end
       end

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

@@ -33,7 +33,7 @@ module DynamicMigrations
 
                   # If the function exists in both the configuration and database representations
                   # but the definition is different then we need to update the definition.
-                  elsif configuration_function[:definition][:matches] == false
+                  elsif configuration_function[:normalized_definition][:matches] == false
                     function = @database.configured_schema(schema_name).function(function_name)
                     @generator.update_function function
                     # does the description also need to be updated

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

@@ -44,9 +44,9 @@ module DynamicMigrations
                       if configuration_foreign_key_constraint[:description][:matches] == false
                         # if the description was removed
                         if configuration_foreign_key_constraint[:description].nil?
-                          @generator.remove_foreign_key_constraint_comment foreign_key_constraint
+                          @generator.remove_foreign_key_constraint_comment updated_foreign_key_constraint
                         else
-                          @generator.set_foreign_key_constraint_comment foreign_key_constraint
+                          @generator.set_foreign_key_constraint_comment updated_foreign_key_constraint
                         end
                       end
 

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

@@ -44,9 +44,9 @@ module DynamicMigrations
                       if configuration_index[:description][:matches] == false
                         # if the description was removed
                         if configuration_index[:description].nil?
-                          @generator.remove_index_comment index
+                          @generator.remove_index_comment updated_index
                         else
-                          @generator.set_index_comment index
+                          @generator.set_index_comment updated_index
                         end
                       end
 

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

@@ -44,9 +44,9 @@ module DynamicMigrations
                       if configuration_trigger[:description][:matches] == false
                         # if the description was removed
                         if configuration_trigger[:description].nil?
-                          @generator.remove_trigger_comment trigger
+                          @generator.remove_trigger_comment updated_trigger
                         else
-                          @generator.set_trigger_comment trigger
+                          @generator.set_trigger_comment updated_trigger
                         end
                       end
 

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

@@ -44,9 +44,9 @@ module DynamicMigrations
                       if configuration_unique_constraint[:description][:matches] == false
                         # if the description was removed
                         if configuration_unique_constraint[:description].nil?
-                          @generator.remove_unique_constraint_comment unique_constraint
+                          @generator.remove_unique_constraint_comment updated_unique_constraint
                         else
-                          @generator.set_unique_constraint_comment unique_constraint
+                          @generator.set_unique_constraint_comment updated_unique_constraint
                         end
                       end
 

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

@@ -44,9 +44,9 @@ module DynamicMigrations
                       if configuration_validation[:description][:matches] == false
                         # if the description was removed
                         if configuration_validation[:description].nil?
-                          @generator.remove_validation_comment validation
+                          @generator.remove_validation_comment updated_validation
                         else
-                          @generator.set_validation_comment validation
+                          @generator.set_validation_comment updated_validation
                         end
                       end
 

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

@@ -172,7 +172,7 @@ module DynamicMigrations
             # the base functions
             functions.each do |function_name, function|
               result[function_name] = compare_record function, comparison_functions[function_name], [
-                :definition,
+                :normalized_definition,
                 :description
               ]
             end
@@ -249,7 +249,7 @@ module DynamicMigrations
                 :action_timing,
                 :event_manipulation,
                 :action_order,
-                :action_condition,
+                :normalized_action_condition,
                 :parameters,
                 :action_orientation,
                 :action_reference_old_table,
@@ -332,7 +332,7 @@ module DynamicMigrations
             validations.each do |name, validation|
               # compare this validation to the equivilent in the comparison list
               result[name] = compare_record validation, comparison_validations[name], [
-                :check_clause,
+                :normalized_check_clause,
                 :column_names,
                 :description,
                 :deferrable,

data/lib/dynamic_migrations/postgres/server/database/enums_loader.rb

@@ -22,7 +22,7 @@ module DynamicMigrations
             rows.each do |row|
               schema_name = row["schema_name"].to_sym
               enum_name = row["enum_name"].to_sym
-              enum_value = row["enum_value"].to_sym
+              enum_value = row["enum_value"]
 
               schema = schemas[schema_name] ||= {}
               enum = schema[enum_name] ||= {

data/lib/dynamic_migrations/postgres/server/database/keys_and_unique_constraints_loader.rb

@@ -99,6 +99,14 @@ module DynamicMigrations
             SQL
           end
 
+          def refresh_database_keys_and_unique_constraints_cache
+            connection.exec(<<~SQL)
+              REFRESH MATERIALIZED VIEW public.dynamic_migrations_keys_and_unique_constraints_cache
+            SQL
+          rescue PG::UndefinedTable
+            create_database_keys_and_unique_constraints_cache
+          end
+
           # fetch all required data from the database and build and return a
           # useful hash representing the keys and indexes of your database
           def fetch_keys_and_unique_constraints

data/lib/dynamic_migrations/postgres/server/database/schema/function.rb

@@ -13,6 +13,9 @@ module DynamicMigrations
             class ExpectedDefinitionError < StandardError
             end
 
+            class UnnormalizableDefinitionError < StandardError
+            end
+
             attr_reader :schema
             attr_reader :name
             attr_reader :definition
@@ -31,7 +34,7 @@ module DynamicMigrations
               raise ExpectedSymbolError, name unless name.is_a? Symbol
               @name = name
 
-              unless definition.is_a?(String) && definition.strip != "" && definition.strip.end_with?("END;")
+              unless definition.is_a?(String) && definition.strip != "" && definition.strip.end_with?("END;", "END")
                 raise ExpectedDefinitionError, "Definition must be a string, and end with `END;`. Definition provided:\n#{definition}"
               end
               @definition = definition.strip
@@ -59,9 +62,55 @@ module DynamicMigrations
 
             def differences_descriptions other_function
               method_differences_descriptions other_function, [
-                :definition
+                :normalized_definition
               ]
             end
+
+            # temporarily create a function in postgres and fetch the actual
+            # normalized definition directly from the database
+            def normalized_definition
+              # no need to normalize definitions which originated from the database
+              if from_database?
+                definition
+              else
+                @normalized_definition ||= fetch_normalized_definition
+              end
+            end
+
+            private
+
+            def fetch_normalized_definition
+              fn_def = schema.database.with_connection do |connection|
+                # wrapped in a transaction just in case something here fails, because
+                # we don't want the function to be persisted
+                connection.exec("BEGIN")
+
+                # create a temporary function, from which we will fetch the normalized definition
+                connection.exec(<<~SQL)
+                  CREATE OR REPLACE FUNCTION normalized_definition_temp_fn() returns trigger language plpgsql AS
+                  $$#{definition}$$;
+                SQL
+
+                # get the normalzed version of the definition
+                rows = connection.exec(<<~SQL)
+                  SELECT prosrc AS function_definition
+                  FROM pg_proc
+                  WHERE proname = 'normalized_definition_temp_fn';
+                SQL
+
+                # delete the temp table and close the transaction
+                connection.exec("ROLLBACK")
+
+                # return the normalized function definition
+                rows.first["function_definition"]
+              end
+
+              if fn_def.nil?
+                raise UnnormalizableDefinitionError, "Failed to nomalize action condition `#{definition}`"
+              end
+
+              fn_def
+            end
           end
         end
       end

data/lib/dynamic_migrations/postgres/server/database/schema/table/column.rb

@@ -36,7 +36,11 @@ module DynamicMigrations
                 @data_type = data_type
 
                 @null = null
-                @default = default
+
+                unless default.nil?
+                  raise ExpectedStringError, default unless default.is_a? String
+                  @default = default
+                end
 
                 unless description.nil?
                   raise ExpectedStringError, description unless description.is_a? String
@@ -50,7 +54,7 @@ module DynamicMigrations
                   unless enum.is_a? Enum
                     raise UnexpectedEnumError, "#{enum} is not a valid enum"
                   end
-                  unless @data_type == enum.full_name || @data_type == "#{enum.full_name}[]"
+                  if (array? && @data_type != :"#{enum.full_name}[]") || (!array? && @data_type != enum.full_name)
                     raise UnexpectedEnumError, "enum `#{enum.full_name}` does not match this column's data type `#{@data_type}`"
                   end
                   @enum = enum
@@ -68,6 +72,29 @@ module DynamicMigrations
               def array?
                 @data_type.end_with? "[]"
               end
+
+              def enum?
+                !@enum.nil?
+              end
+
+              # for arrays returns the column type without the array brackets, for non arrays
+              # jsut returnms the column type
+              def base_data_type
+                array? ? @data_type[0..-3]&.to_sym : @data_type
+              end
+
+              # sometimes this system makes temporary tables in order to fetch the normalized
+              # version of constraint check clauses, function definitions or trigger action conditions
+              # because certain data types might not yet exist, we need to use alternative types
+              def temp_table_data_type
+                if enum
+                  :text
+                elsif @data_type == :citext || @data_type == :"citext[]"
+                  :text
+                else
+                  @data_type
+                end
+              end
             end
           end
         end

data/lib/dynamic_migrations/postgres/server/database/schema/table/foreign_key_constraint.rb

@@ -14,9 +14,6 @@ module DynamicMigrations
               class ExpectedArrayOfColumnsError < StandardError
               end
 
-              class ExpectedDifferentTablesError < StandardError
-              end
-
               class DuplicateColumnError < StandardError
               end
 
@@ -49,14 +46,14 @@ module DynamicMigrations
                   raise ExpectedArrayOfColumnsError
                 end
 
-                if table.name == foreign_table.name && table.schema.name == foreign_table.schema.name
-                  raise ExpectedDifferentTablesError
-                end
-
                 # tables must be set before the columns are added
                 @table = table
                 @foreign_table = foreign_table
 
+                # add this foreign_key_constraint to the remote table (so we can always find
+                # these from both sides of the association)
+                @foreign_table.add_remote_foreign_key_constraint self
+
                 @columns = {}
                 columns.each do |column|
                   add_column column

data/lib/dynamic_migrations/postgres/server/database/schema/table/foreign_key_constraints.rb

@@ -61,6 +61,11 @@ module DynamicMigrations
                 # return the new foreign_key_constraint
                 new_foreign_key_constraint
               end
+
+              # called automatically from the other side of the foreign key constraint to keep track of the foreign key from both sides
+              def add_remote_foreign_key_constraint foreign_key_constraint
+                @remote_foreign_key_constraints << foreign_key_constraint
+              end
             end
           end
         end