external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Escape/Unescape sql comment chars

pull/6763/head^2
Gokhan Gulbiz 2023-03-15 08:11:07 +03:00
parent 80dd73711e
commit 3cfa197f69
No known key found for this signature in database
GPG Key ID: 608EF06B6BD1B45B
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/distributed/utils/attribute.c
View File

@ -26,6 +26,7 @@
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/json.h" #include "utils/json.h"
#include "distributed/utils/attribute.h" #include "distributed/utils/attribute.h"
#include "common/base64.h"
#include <time.h> #include <time.h>
@ -214,7 +215,7 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
text *tenantIdTextP = ExtractFieldTextP(jsonbDatum, "tId"); text *tenantIdTextP = ExtractFieldTextP(jsonbDatum, "tId");
if (tenantIdTextP != NULL) if (tenantIdTextP != NULL)
{ {
char *tenantId = text_to_cstring(tenantIdTextP); char *tenantId = UnescapeCommentChars(text_to_cstring(tenantIdTextP));
strcpy_s(attributeToTenant, sizeof(attributeToTenant), tenantId); strcpy_s(attributeToTenant, sizeof(attributeToTenant), tenantId);
} }
@ -245,12 +246,15 @@ AnnotateQuery(char *queryString, char *partitionColumn, int colocationId)
return queryString; return queryString;
} }
char *commentCharsEscaped = EscapeCommentChars(partitionColumn);
StringInfo escapedSourceName = makeStringInfo(); StringInfo escapedSourceName = makeStringInfo();
escape_json(escapedSourceName, partitionColumn);
escape_json(escapedSourceName, commentCharsEscaped);
StringInfo newQuery = makeStringInfo(); StringInfo newQuery = makeStringInfo();
appendStringInfo(newQuery, ATTRIBUTE_STRING_FORMAT, escapedSourceName->data, appendStringInfo(newQuery, ATTRIBUTE_STRING_FORMAT, escapedSourceName->data,
colocationId); colocationId);
appendStringInfoString(newQuery, queryString); appendStringInfoString(newQuery, queryString);
return newQuery->data; return newQuery->data;