Fixed bug #8253 : Incorrect handling of non-ASCII object names in CREATE MAPPING statement

hvlad · hvlad · commit 1e932689ccf2 · 2024-09-17T00:58:56.000+03:00
diff --git a/src/dsql/DdlNodes.epp b/src/dsql/DdlNodes.epp
@@ -10628,6 +10628,7 @@ void MappingNode::runInSecurityDb(SecDbContext* secDbContext)
 			ddl += ' ';
 			if (from)
 			{
+				ddl += "_utf8 ";
 				addItem(ddl, fromUtf8.c_str(), '\'');
 				ddl += ' ';
 			}
diff --git a/src/dsql/parse.y b/src/dsql/parse.y
@@ -7448,7 +7448,7 @@ map_from_symbol_name
 %type <intlStringPtr> map_logoninfo
 map_logoninfo
 	: sql_string
-	| valid_symbol_name		{ $$ = newNode<IntlString>($1->c_str()); }
+	| valid_symbol_name		{ $$ = newIntlString($1->c_str(), metadataCharSet->getName()); }
 	;
 
 %type map_using(<mappingNode>)

Original file line number	Diff line number	Diff line change
`@@ -10628,6 +10628,7 @@ void MappingNode::runInSecurityDb(SecDbContext* secDbContext)`
`10628`	`10628`	`ddl += ' ';`
`10629`	`10629`	`if (from)`
`10630`	`10630`	`{`
	`10631`	`+ ddl += "_utf8 ";`
`10631`	`10632`	`addItem(ddl, fromUtf8.c_str(), '\'');`
`10632`	`10633`	`ddl += ' ';`
`10633`	`10634`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7448,7 +7448,7 @@ map_from_symbol_name`
`7448`	`7448`	`%type <intlStringPtr> map_logoninfo`
`7449`	`7449`	`map_logoninfo`
`7450`	`7450`	`: sql_string`
`7451`		`- \| valid_symbol_name { $$ = newNode<IntlString>($1->c_str()); }`
	`7451`	`+ \| valid_symbol_name { $$ = newIntlString($1->c_str(), metadataCharSet->getName()); }`
`7452`	`7452`	`;`
`7453`	`7453`
`7454`	`7454`	`%type map_using(<mappingNode>)`