From 97f15da12f74d6ee01091ac875f179e9147ace1c Mon Sep 17 00:00:00 2001 From: Vitaly Stoyan Date: Wed, 30 Oct 2024 10:17:07 +0300 Subject: [PATCH] Backport #11068 (#11087) --- ydb/library/yql/parser/pg_catalog/safe_procs.h | 2 ++ ydb/library/yql/tools/yqlrun/pg_ext.txt | 6 +++--- ydb/library/yql/tools/yqlrun/uig.sh | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ydb/library/yql/parser/pg_catalog/safe_procs.h b/ydb/library/yql/parser/pg_catalog/safe_procs.h index d691aad89981..6c110c7301f3 100644 --- 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 index 7dc0335fe9bb..4983ac319373 100644 --- 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 index 4c653838a9ef..5f450a8976d7 100755 --- 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=