Include missing mention of external_executor_id in `sql_engine_coll…

…ation_for_ids` docs (#25197) (cherry picked from commit 93b7a57)
apache · Aug 16, 2022 · 249b11d · 249b11d
1 parent 4a8d139
commit 249b11d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/airflow/config_templates/config.yml b/airflow/config_templates/config.yml
@@ -410,7 +410,8 @@
       default: "utf-8"
     - name: sql_engine_collation_for_ids
       description: |
-        Collation for ``dag_id``, ``task_id``, ``key`` columns in case they have different encoding.
+        Collation for ``dag_id``, ``task_id``, ``key``, ``external_executor_id`` columns
+        in case they have different encoding.
         By default this collation is the same as the database collation, however for ``mysql`` and ``mariadb``
         the default is ``utf8mb3_bin`` so that the index sizes of our index keys will not exceed
         the maximum size of allowed index when collation is set to ``utf8mb4`` variant

diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg
@@ -230,7 +230,8 @@ sql_alchemy_conn = sqlite:///{AIRFLOW_HOME}/airflow.db
 # The encoding for the databases
 sql_engine_encoding = utf-8
 
-# Collation for ``dag_id``, ``task_id``, ``key`` columns in case they have different encoding.
+# Collation for ``dag_id``, ``task_id``, ``key``, ``external_executor_id`` columns
+# in case they have different encoding.
 # By default this collation is the same as the database collation, however for ``mysql`` and ``mariadb``
 # the default is ``utf8mb3_bin`` so that the index sizes of our index keys will not exceed
 # the maximum size of allowed index when collation is set to ``utf8mb4`` variant