YQL-13710 more patches

ref:5a687661f94991161a9b341fa2084c16630e4511

3 files changed, 9 insertions, 4 deletions

diff --git a/ydb/library/yql/parser/pg_query_wrapper/copy_src.py b/ydb/library/yql/parser/pg_query_wrapper/copy_src.py
index 8e33f5eb3e..0dafe34f36 100644
--- a/ydb/library/yql/parser/pg_query_wrapper/copy_src.py
+++ b/ydb/library/yql/parser/pg_query_wrapper/copy_src.py
@@ -18,6 +18,8 @@ to_add_const = set([
     "nullSemAction",
     "sentinel",
     "backslash_quote",
+    "escape_string_warning",
+    "standard_conforming_strings",
     "gistBufferingOptValues",
     "boolRelOpts",
     "intRelOpts",
@@ -113,6 +115,9 @@ def fix_line(line, all_lines, pos):
           if v == "backslash_quote":
               ret = ret.replace("int","const int")
 
+          if v == "escape_string_warning" or v == "standard_conforming_strings":
+              ret = ret.replace("bool","const bool")
+
           if v == "nullSemAction":
               ret = ret.replace("JsonSemAction","const JsonSemAction")
 
diff --git a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/backend/parser/scan.c b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/backend/parser/scan.c
index 82070bd9e7..7c1a9f7cc2 100644
--- a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/backend/parser/scan.c
+++ b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/backend/parser/scan.c
@@ -5137,8 +5137,8 @@ fprintf_to_ereport(const char *fmt, const char *msg)
  * But we shall have to live with it until we can remove these variables.
  */
 const int			backslash_quote = BACKSLASH_QUOTE_SAFE_ENCODING;
-__thread bool		escape_string_warning = true;
-__thread bool		standard_conforming_strings = true;
+const bool		escape_string_warning = true;
+const bool		standard_conforming_strings = true;
 
 /*
  * Constant data exported from this file.  This array maps from the
diff --git a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/parser/parser.h b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/parser/parser.h
index 94a77d2665..0621056cbc 100644
--- a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/parser/parser.h
+++ b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/parser/parser.h
@@ -27,8 +27,8 @@ typedef enum
 
 /* GUC variables in scan.l (every one of these is a bad idea :-() */
 extern const int	backslash_quote;
-extern __thread bool escape_string_warning;
-extern __thread PGDLLIMPORT bool standard_conforming_strings;
+extern const bool escape_string_warning;
+extern PGDLLIMPORT const bool standard_conforming_strings;
 
 
 /* Primary entry point for the raw parsing functions */