Allow process_revision_directives option to be configurable (#523)

src/flask_migrate/templates/aioflask-multidb/env.py

@@ -131,6 +131,10 @@ def process_revision_directives(context, revision, directives):
                     directives[:] = []
                     logger.info('No changes in schema detected.')
 
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
     for name, rec in engines.items():
         rec['sync_connection'] = conn = rec['connection']._sync_connection()
         if USE_TWOPHASE:
@@ -146,8 +150,7 @@ def process_revision_directives(context, revision, directives):
                 upgrade_token="%s_upgrades" % name,
                 downgrade_token="%s_downgrades" % name,
                 target_metadata=get_metadata(name),
-                process_revision_directives=process_revision_directives,
-                **current_app.extensions['migrate'].configure_args
+                **conf_args
             )
             context.run_migrations(engine_name=name)
 

src/flask_migrate/templates/aioflask/env.py

@@ -84,11 +84,14 @@ def process_revision_directives(context, revision, directives):
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
     context.configure(
         connection=connection,
         target_metadata=get_metadata(),
-        process_revision_directives=process_revision_directives,
-        **current_app.extensions['migrate'].configure_args
+        **conf_args
     )
 
     with context.begin_transaction():

src/flask_migrate/templates/flask-multidb/env.py

@@ -136,6 +136,10 @@ def process_revision_directives(context, revision, directives):
                     directives[:] = []
                     logger.info('No changes in schema detected.')
 
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
     # for the direct-to-DB use case, start a transaction on all
     # engines, then run all migrations, then commit all transactions.
     engines = {
@@ -162,8 +166,7 @@ def process_revision_directives(context, revision, directives):
                 upgrade_token="%s_upgrades" % name,
                 downgrade_token="%s_downgrades" % name,
                 target_metadata=get_metadata(name),
-                process_revision_directives=process_revision_directives,
-                **current_app.extensions['migrate'].configure_args
+                **conf_args
             )
             context.run_migrations(engine_name=name)
 

src/flask_migrate/templates/flask/env.py

@@ -90,14 +90,17 @@ def process_revision_directives(context, revision, directives):
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
     connectable = get_engine()
 
     with connectable.connect() as connection:
         context.configure(
             connection=connection,
             target_metadata=get_metadata(),
-            process_revision_directives=process_revision_directives,
-            **current_app.extensions['migrate'].configure_args
+            **conf_args
         )
 
         with context.begin_transaction():

tests/custom_template/env.py

@@ -70,14 +70,17 @@ def process_revision_directives(context, revision, directives):
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
     connectable = current_app.extensions['migrate'].db.get_engine()
 
     with connectable.connect() as connection:
         context.configure(
             connection=connection,
             target_metadata=target_metadata,
-            process_revision_directives=process_revision_directives,
-            **current_app.extensions['migrate'].configure_args
+            **conf_args
         )
 
         with context.begin_transaction():