Skip to content

Commit 90841d1

Browse files
committed
Fix problem with character aliases like (utf-8) in ISQL.
1 parent 9c6855b commit 90841d1

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/isql/isql.epp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6943,7 +6943,17 @@ static processing_state parse_arg(int argc, SCHAR** argv, QualifiedMetaString& t
69436943
break;
69446944

69456945
case IN_SW_ISQL_CHARSET:
6946-
setValues.ISQL_charset = QualifiedMetaString::parseSchemaObject(swarg_str);
6946+
try
6947+
{
6948+
setValues.ISQL_charset = QualifiedMetaString::parseSchemaObject(swarg_str);
6949+
}
6950+
catch (const status_exception&)
6951+
{
6952+
// hack for aliases like utf-8
6953+
string str(swarg_str);
6954+
str.upper();
6955+
setValues.ISQL_charset = QualifiedMetaString(str);
6956+
}
69476957
break;
69486958

69496959
case IN_SW_ISQL_QUIET:

0 commit comments

Comments
 (0)