Backport ydb-platform#11068 (ydb-platform#11087)

vitstn · Oct 30, 2024 · 97f15da · 97f15da
1 parent 508b66c
commit 97f15da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/ydb/library/yql/parser/pg_catalog/safe_procs.h b/ydb/library/yql/parser/pg_catalog/safe_procs.h
@@ -21,6 +21,8 @@
 
 // postgis
 "postgis_lib_version",
+"st_interiorringn",
+"st_collectionhomogenize",
 
 //dbeaver
 "pg_get_expr",

diff --git a/ydb/library/yql/tools/yqlrun/pg_ext.txt b/ydb/library/yql/tools/yqlrun/pg_ext.txt
@@ -1,9 +1,9 @@
 Extension {
     Name: "postgis"
     InstallName: "$libdir/postgis-3"
-    SqlPath: "../../../../../yql/pg_ext/postgis/libs/postgis/postgis/postgis.sql"
-    SqlPath: "../../../../../yql/pg_ext/postgis/libs/postgis/spatial_ref_sys.sql"
-    LibraryPath: "../../../../../yql/pg_ext/postgis/libs/postgis/libpostgis.so"
+    SqlPath: "../../../../../../yql/pg_ext/postgis/libs/postgis/postgis/postgis.sql"
+    SqlPath: "../../../../../../yql/pg_ext/postgis/libs/postgis/spatial_ref_sys.sql"
+    LibraryPath: "../../../../../../yql/pg_ext/postgis/libs/postgis/libpostgis.so"
     Version: "3.4.3dev"
 }
 
diff --git a/ydb/library/yql/tools/yqlrun/uig.sh b/ydb/library/yql/tools/yqlrun/uig.sh
@@ -9,10 +9,10 @@
 
 SCRIPT_DIR="$(dirname $(readlink -f "$0"))"
 UDFS_DIR="${SCRIPT_DIR}/../../udfs"
-if [ -d "${SCRIPT_DIR}/../../../../../yql" ]; then
-UDFS_DIR="${UDFS_DIR};${SCRIPT_DIR}/../../../../../yql/udfs"
+if [ -d "${SCRIPT_DIR}/../../../../../../yql" ]; then
+UDFS_DIR="${UDFS_DIR};${SCRIPT_DIR}/../../../../../../yql/udfs"
 fi
-if [ -d "${SCRIPT_DIR}/../../../../../yql" ]; then
+if [ -d "${SCRIPT_DIR}/../../../../../../yql" ]; then
 PG_EXT_OPT="--pg-ext pg_ext.txt"
 else
 PG_EXT_OPT=