Moved a PG note to PG connector from formula ref

datalens-tech · Nov 9, 2023 · 10a80fd · 10a80fd
1 parent c0c3b04
commit 10a80fd
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 24 deletions.
diff --git a/docker_build/target_translations/target_update_po/Dockerfile b/docker_build/target_translations/target_update_po/Dockerfile
@@ -28,6 +28,8 @@ RUN for domain_pair in $(dl-package --package-path=. list-i18n-domains) ; do \
     for locale in $(ls $PACKAGE_NAME/locales/) ; do \
     mkdir -p $LOCALES_DIR/$locale/LC_MESSAGES ; \
     msgmerge $PACKAGE_NAME/locales/$locale/LC_MESSAGES/$DOMAIN_NAME.po $DOMAIN_NAME.po > $LOCALES_DIR/$locale/LC_MESSAGES/$DOMAIN_NAME.po; \
+    # Now replace the date with a fixed one so that it doesn't get updated every time
+    sed -i -r "s/POT-Creation-Date: [0-9]+-[0-9]+-[0-9]+ [0-9]+:[0-9]+\\+[0-9]+/POT-Creation-Date: 2023-09-22 08:16+0000/g" $LOCALES_DIR/$locale/LC_MESSAGES/$DOMAIN_NAME.po; \
     done; \
     done
 

diff --git a/lib/dl_connector_postgresql/dl_connector_postgresql/formula_ref/plugin.py b/lib/dl_connector_postgresql/dl_connector_postgresql/formula_ref/plugin.py
@@ -8,6 +8,8 @@
     CONFIGS,
     Translatable,
 )
+from dl_formula_ref.functions.array import FUNCTION_UNNEST
+from dl_formula_ref.registry.note import Note
 
 
 class PostgresSQLFormulaRefPlugin(FormulaRefPlugin):
@@ -28,3 +30,17 @@ class PostgresSQLFormulaRefPlugin(FormulaRefPlugin):
             (PostgreSQLDialect.NON_COMPENG_POSTGRESQL, "varchar"): Translatable("Alias for `character varying`"),
         },
     )
+    function_extensions = [
+        FUNCTION_UNNEST.extend(
+            dialect=PostgreSQLDialect.NON_COMPENG_POSTGRESQL,
+            notes=(
+                Note(
+                    Translatable(
+                        "{dialects: POSTGRESQL} doesn't allow filtering fields containing the UNNEST "
+                        "function. If the data source is {dialects: POSTGRESQL}, do not use such "
+                        "fields in selectors."
+                    )
+                ),
+            ),
+        ),
+    ]
diff --git a/.../dl_connector_postgresql/locales/en/LC_MESSAGES/dl_formula_ref_dl_connector_postgresql.po b/.../dl_connector_postgresql/locales/en/LC_MESSAGES/dl_formula_ref_dl_connector_postgresql.po
@@ -26,3 +26,9 @@ msgstr ""
 
 msgid "Alias for `character varying`"
 msgstr ""
+
+msgid ""
+"{dialects: POSTGRESQL} doesn't allow filtering fields containing the UNNEST "
+"function. If the data source is {dialects: POSTGRESQL}, do not use such "
+"fields in selectors."
+msgstr ""
diff --git a/.../dl_connector_postgresql/locales/ru/LC_MESSAGES/dl_formula_ref_dl_connector_postgresql.mo b/.../dl_connector_postgresql/locales/ru/LC_MESSAGES/dl_formula_ref_dl_connector_postgresql.mo
diff --git a/.../dl_connector_postgresql/locales/ru/LC_MESSAGES/dl_formula_ref_dl_connector_postgresql.po b/.../dl_connector_postgresql/locales/ru/LC_MESSAGES/dl_formula_ref_dl_connector_postgresql.po
@@ -26,3 +26,12 @@ msgstr "Алиас для `character`"
 
 msgid "Alias for `character varying`"
 msgstr "Алиас для `character varying`"
+
+msgid ""
+"{dialects: POSTGRESQL} doesn't allow filtering fields containing the UNNEST "
+"function. If the data source is {dialects: POSTGRESQL}, do not use such "
+"fields in selectors."
+msgstr ""
+"{dialects: POSTGRESQL} запрещает фильтрацию по полям, содержащим функцию "
+"`UNNEST`. Не используйте такие поля для создания селектора, если источник "
+"данных — {dialects: POSTGRESQL}."
diff --git a/lib/dl_formula_ref/dl_formula_ref/functions/array.py b/lib/dl_formula_ref/dl_formula_ref/functions/array.py
@@ -130,15 +130,6 @@
     name="unnest",
     category=CATEGORY_ARRAY,
     description=_("Expands the {arg:0} array expression to a set of rows."),
-    notes=[
-        Note(
-            Translatable(
-                "{dialects: POSTGRESQL} doesn't allow filtering fields containing the UNNEST "
-                "function. If the data source is {dialects: POSTGRESQL}, do not use such "
-                "fields in selectors."
-            )
-        ),
-    ],
     examples=[
         DataExample(
             example_config=ExampleConfig(

diff --git a/lib/dl_formula_ref/dl_formula_ref/locales/en/LC_MESSAGES/dl_formula_ref_dl_formula_ref.po b/lib/dl_formula_ref/dl_formula_ref/locales/en/LC_MESSAGES/dl_formula_ref_dl_formula_ref.po
@@ -777,12 +777,6 @@ msgstr ""
 msgid "Expands the {arg:0} array expression to a set of rows."
 msgstr ""
 
-msgid ""
-"{dialects: POSTGRESQL} doesn't allow filtering fields containing the UNNEST "
-"function. If the data source is {dialects: POSTGRESQL}, do not use such "
-"fields in selectors."
-msgstr ""
-
 msgid ""
 "Returns the element with the index {arg:1} from the array {arg:0}. Index "
 "must be any integer. Indexes in an array begin with one."

diff --git a/lib/dl_formula_ref/dl_formula_ref/locales/ru/LC_MESSAGES/dl_formula_ref_dl_formula_ref.po b/lib/dl_formula_ref/dl_formula_ref/locales/ru/LC_MESSAGES/dl_formula_ref_dl_formula_ref.po
@@ -1202,15 +1202,6 @@ msgstr ""
 msgid "Expands the {arg:0} array expression to a set of rows."
 msgstr "Дублирует исходную строку для каждого элемента массива {arg:0}."
 
-msgid ""
-"{dialects: POSTGRESQL} doesn't allow filtering fields containing the UNNEST "
-"function. If the data source is {dialects: POSTGRESQL}, do not use such "
-"fields in selectors."
-msgstr ""
-"{dialects: POSTGRESQL} запрещает фильтрацию по полям, содержащим функцию "
-"`UNNEST`. Не используйте такие поля для создания селектора, если источник "
-"данных — {dialects: POSTGRESQL}."
-
 msgid ""
 "Returns the element with the index {arg:1} from the array {arg:0}. Index "
 "must be any integer. Indexes in an array begin with one."