From 0ee0ee555369348af5135ad4c2e2c63feb80572c Mon Sep 17 00:00:00 2001 From: Rishabh Tanwar <33982749+rishabhtanwar29@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:27:32 +0530 Subject: [PATCH] Fix formatting issue in CAST MONEY to CHAR/VARCHAR (#3367) While CASTing money/smallmoney to (N)VARCHAR/(N)CHAR, the value get rounded to 4 decimal places instead of 2. Fixed this by implementing CASTs from money to CHAR/VARCHAR datatype which rounds off input money value to 2 decimal places and converts it to string. Additionally, while CASTing money values to (N)CHAR, the resultant string gets left padded instead of usual right padding. This commit also fixes this issue. Task: BABEL-5478 Signed-off-by: Rishabh Tanwar --- .../babelfish_common_helper--3.7.0--3.8.0.sql | 22 ++ contrib/babelfishpg_common/sql/varchar.sql | 22 ++ contrib/babelfishpg_common/src/varchar.c | 86 +++++++ contrib/babelfishpg_money/fixeddecimal.c | 36 ++- contrib/babelfishpg_tsql/src/pltsql_coerce.c | 12 +- test/JDBC/expected/BABEL-1193.out | 14 +- test/JDBC/expected/BABEL-3486-vu-verify.out | 4 +- test/JDBC/expected/BABEL-889-vu-verify.out | 4 +- test/JDBC/expected/BABEL-889.out | 4 +- test/JDBC/expected/babel_functions_cast.out | 8 +- ...before_16_4_or_15_8_or_14_13-vu-verify.out | 12 +- .../babelfish_function_ext-vu-verify.out | 12 +- .../concat-before-15_9-or-16_5-vu-verify.out | 70 +++--- test/JDBC/expected/concat-vu-prepare.out | 2 +- test/JDBC/expected/concat-vu-verify.out | 84 +++---- ...ncat_ws-before-15_5-or-14_10-vu-verify.out | 154 ++++++------- ...oncat_ws-before-15_9-or-16_5-vu-verify.out | 154 ++++++------- test/JDBC/expected/concat_ws-vu-prepare.out | 2 +- test/JDBC/expected/concat_ws-vu-verify.out | 168 +++++++------- ...n_cleanup__14_10__BABEL-2877-vu-verify.out | 12 +- ...on_cleanup__14_6__BABEL-2877-vu-verify.out | 12 +- ...on_cleanup__14_7__BABEL-2877-vu-verify.out | 12 +- ...on_cleanup__14_8__BABEL-2877-vu-verify.out | 12 +- ...on_cleanup__14_9__BABEL-2877-vu-verify.out | 12 +- ...on_cleanup__15_1__BABEL-2877-vu-verify.out | 12 +- ...on_cleanup__15_2__BABEL-2877-vu-verify.out | 12 +- .../ltrim-before-15_8-or-16_4-vu-verify.out | 4 +- test/JDBC/expected/ltrim-vu-verify.out | 4 +- .../chinese_prc_ci_as/BABEL-889-vu-verify.out | 4 +- .../chinese_prc_ci_as/BABEL-889.out | 4 +- .../concat-before-15_9-or-16_5-vu-verify.out | 70 +++--- .../chinese_prc_ci_as/concat-vu-verify.out | 84 +++---- ...ncat_ws-before-15_5-or-14_10-vu-verify.out | 154 ++++++------- ...oncat_ws-before-15_9-or-16_5-vu-verify.out | 154 ++++++------- .../chinese_prc_ci_as/concat_ws-vu-verify.out | 168 +++++++------- .../ltrim-before-15_8-or-16_4-vu-verify.out | 4 +- .../chinese_prc_ci_as/ltrim-vu-verify.out | 4 +- .../replace-before-14_3-vu-verify.out | 8 +- .../replace-before-15_8-or-16_4-vu-verify.out | 8 +- .../chinese_prc_ci_as/replace-vu-verify.out | 8 +- ...eplicate-before-15_8-or-16_4-vu-verify.out | 4 +- .../chinese_prc_ci_as/replicate-vu-verify.out | 4 +- .../reverse-before-15_8-or-16_4-vu-verify.out | 4 +- .../chinese_prc_ci_as/reverse-vu-verify.out | 4 +- .../right-before-15_8-or-16_4-vu-verify.out | 4 +- .../chinese_prc_ci_as/right-vu-verify.out | 4 +- .../rtrim-before-15_8-or-16_4-vu-verify.out | 4 +- .../chinese_prc_ci_as/rtrim-vu-verify.out | 4 +- .../string_agg-before-14_5-vu-verify.out | 24 +- ...ing_agg-before-15_5-or-14_10-vu-verify.out | 24 +- ...ring_agg-before-15_9-or-16_5-vu-verify.out | 24 +- .../string_agg-vu-verify.out | 24 +- .../stuff-before-15_8-or-16_4-vu-verify.out | 8 +- .../chinese_prc_ci_as/stuff-vu-verify.out | 8 +- .../trim-before-15_11-or-16_7-vu-verify.out | 4 +- .../chinese_prc_ci_as/trim-vu-verify.out | 4 +- ...er_lower-before-15_8-or-16_4-vu-verify.out | 8 +- .../upper_lower-vu-verify.out | 8 +- .../japanese_ci_as/BABEL-889-vu-verify.out | 4 +- .../japanese_ci_as/BABEL-889.out | 4 +- .../concat-before-15_9-or-16_5-vu-verify.out | 70 +++--- .../japanese_ci_as/concat-vu-verify.out | 80 ++++--- ...ncat_ws-before-15_5-or-14_10-vu-verify.out | 154 ++++++------- ...oncat_ws-before-15_9-or-16_5-vu-verify.out | 112 +++++----- .../japanese_ci_as/concat_ws-vu-verify.out | 168 +++++++------- .../ltrim-before-15_8-or-16_4-vu-verify.out | 4 +- .../japanese_ci_as/ltrim-vu-verify.out | 4 +- .../replace-before-15_8-or-16_4-vu-verify.out | 8 +- .../japanese_ci_as/replace-vu-verify.out | 8 +- ...eplicate-before-15_8-or-16_4-vu-verify.out | 4 +- .../japanese_ci_as/replicate-vu-verify.out | 4 +- .../reverse-before-15_8-or-16_4-vu-verify.out | 4 +- .../japanese_ci_as/reverse-vu-verify.out | 4 +- .../right-before-15_8-or-16_4-vu-verify.out | 4 +- .../japanese_ci_as/right-vu-verify.out | 4 +- .../rtrim-before-15_8-or-16_4-vu-verify.out | 4 +- .../japanese_ci_as/rtrim-vu-verify.out | 4 +- .../string_agg-before-14_5-vu-verify.out | 12 +- ...ing_agg-before-15_5-or-14_10-vu-verify.out | 24 +- .../japanese_ci_as/string_agg-vu-verify.out | 24 +- .../stuff-before-15_8-or-16_4-vu-verify.out | 8 +- .../japanese_ci_as/stuff-vu-verify.out | 8 +- .../trim-before-15_11-or-16_7-vu-verify.out | 4 +- .../japanese_ci_as/trim-vu-verify.out | 4 +- ...er_lower-before-15_8-or-16_4-vu-verify.out | 8 +- .../japanese_ci_as/upper_lower-vu-verify.out | 8 +- .../replace-before-14_3-vu-verify.out | 8 +- .../replace-before-15_8-or-16_4-vu-verify.out | 8 +- test/JDBC/expected/replace-vu-verify.out | 8 +- ...eplicate-before-15_8-or-16_4-vu-verify.out | 4 +- test/JDBC/expected/replicate-vu-verify.out | 4 +- .../reverse-before-15_8-or-16_4-vu-verify.out | 4 +- test/JDBC/expected/reverse-vu-verify.out | 4 +- .../right-before-15_8-or-16_4-vu-verify.out | 4 +- test/JDBC/expected/right-vu-verify.out | 4 +- .../rtrim-before-15_8-or-16_4-vu-verify.out | 4 +- test/JDBC/expected/rtrim-vu-verify.out | 4 +- .../string_agg-before-14_5-vu-verify.out | 24 +- ...ing_agg-before-15_5-or-14_10-vu-verify.out | 24 +- ...ring_agg-before-15_9-or-16_5-vu-verify.out | 24 +- test/JDBC/expected/string_agg-vu-verify.out | 24 +- .../stuff-before-15_8-or-16_4-vu-verify.out | 8 +- test/JDBC/expected/stuff-vu-verify.out | 8 +- .../test_conv_money_to_varchar-vu-prepare.out | 22 +- .../test_conv_money_to_varchar-vu-verify.out | 211 ++++++++++-------- .../trim-before-15_11-or-16_7-vu-verify.out | 4 +- test/JDBC/expected/trim-vu-verify.out | 4 +- ...er_lower-before-15_8-or-16_4-vu-verify.out | 8 +- test/JDBC/expected/upper_lower-vu-verify.out | 8 +- .../string_functions/concat-vu-prepare.mix | 2 +- .../string_functions/concat_ws-vu-prepare.mix | 2 +- .../test_conv_money_to_varchar-vu-prepare.sql | 22 +- .../test_conv_money_to_varchar-vu-verify.sql | 43 +++- .../expected_dependency.out | 2 + 114 files changed, 1657 insertions(+), 1387 deletions(-) diff --git a/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--3.7.0--3.8.0.sql b/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--3.7.0--3.8.0.sql index 5ebb39c5fc..a01f3a1f39 100644 --- a/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--3.7.0--3.8.0.sql +++ b/contrib/babelfishpg_common/sql/upgrades/babelfish_common_helper--3.7.0--3.8.0.sql @@ -47,5 +47,27 @@ FOR TYPE sys.SMALLDATETIME USING btree FAMILY smalldatetime_ops AS END IF; END $$; +CREATE OR REPLACE FUNCTION sys.fixeddecimal2varchar(sys.FIXEDDECIMAL, integer, BOOLEAN) +RETURNS sys.VARCHAR +AS 'babelfishpg_common', 'fixeddecimal2varchar' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION sys.fixeddecimal2bpchar(sys.FIXEDDECIMAL, integer, BOOLEAN) +RETURNS sys.BPCHAR +AS 'babelfishpg_common', 'fixeddecimal2bpchar' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE CAST (sys.FIXEDDECIMAL AS sys.VARCHAR) +WITH FUNCTION sys.fixeddecimal2varchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + +CREATE CAST (sys.FIXEDDECIMAL AS pg_catalog.VARCHAR) +WITH FUNCTION sys.fixeddecimal2varchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + +CREATE CAST (sys.FIXEDDECIMAL AS sys.BPCHAR) +WITH FUNCTION sys.fixeddecimal2bpchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + +CREATE CAST (sys.FIXEDDECIMAL AS pg_catalog.BPCHAR) +WITH FUNCTION sys.fixeddecimal2bpchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + -- Reset search_path to not affect any subsequent scripts SELECT set_config('search_path', trim(leading 'sys, ' from current_setting('search_path')), false); diff --git a/contrib/babelfishpg_common/sql/varchar.sql b/contrib/babelfishpg_common/sql/varchar.sql index 4d2570de8a..21054cbde2 100644 --- a/contrib/babelfishpg_common/sql/varchar.sql +++ b/contrib/babelfishpg_common/sql/varchar.sql @@ -302,6 +302,28 @@ LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; CREATE CAST (sys.VARCHAR AS pg_catalog.NUMERIC) WITH FUNCTION sys.varchar2numeric(sys.VARCHAR) AS IMPLICIT; +CREATE OR REPLACE FUNCTION sys.fixeddecimal2varchar(sys.FIXEDDECIMAL, integer, BOOLEAN) +RETURNS sys.VARCHAR +AS 'babelfishpg_common', 'fixeddecimal2varchar' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION sys.fixeddecimal2bpchar(sys.FIXEDDECIMAL, integer, BOOLEAN) +RETURNS sys.BPCHAR +AS 'babelfishpg_common', 'fixeddecimal2bpchar' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE CAST (sys.FIXEDDECIMAL AS sys.VARCHAR) +WITH FUNCTION sys.fixeddecimal2varchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + +CREATE CAST (sys.FIXEDDECIMAL AS pg_catalog.VARCHAR) +WITH FUNCTION sys.fixeddecimal2varchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + +CREATE CAST (sys.FIXEDDECIMAL AS sys.BPCHAR) +WITH FUNCTION sys.fixeddecimal2bpchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + +CREATE CAST (sys.FIXEDDECIMAL AS pg_catalog.BPCHAR) +WITH FUNCTION sys.fixeddecimal2bpchar(sys.FIXEDDECIMAL, integer, BOOLEAN) AS IMPLICIT; + CREATE OR REPLACE FUNCTION sys.nvarchar_larger(sys.NVARCHAR, sys.NVARCHAR) RETURNS sys.NVARCHAR AS 'text_larger' diff --git a/contrib/babelfishpg_common/src/varchar.c b/contrib/babelfishpg_common/src/varchar.c index d2a9b8f4f1..05e26926ab 100644 --- a/contrib/babelfishpg_common/src/varchar.c +++ b/contrib/babelfishpg_common/src/varchar.c @@ -51,6 +51,12 @@ static inline int varcharTruelen(VarChar *arg); #define DEFAULT_LCID 1033 +/* Linkage to function in fixeddecimal module */ +typedef char *(*fixeddecimal2str_t) (int64 val, char *buffer, + int64 fixeddecimal_multiplier, + int64 fixeddecimal_scale); +static fixeddecimal2str_t fixeddecimal2str_p = NULL; + /* * is_basetype_nchar_nvarchar - given datatype is nvarchar or nchar * or created over nvarchar or nchar. @@ -382,6 +388,8 @@ PG_FUNCTION_INFO_V1(varchar2date); PG_FUNCTION_INFO_V1(varchar2time); PG_FUNCTION_INFO_V1(varchar2money); PG_FUNCTION_INFO_V1(varchar2numeric); +PG_FUNCTION_INFO_V1(fixeddecimal2varchar); +PG_FUNCTION_INFO_V1(fixeddecimal2bpchar); /***************************************************************************** * varchar - varchar(n) @@ -930,6 +938,84 @@ varchar2numeric(PG_FUNCTION_ARGS) PG_RETURN_NUMERIC(result); } +#define FIXEDDECIMAL_2_VARCHAR_MULTIPLIER 100LL +#define FIXEDDECIMAL_2_VARCHAR_SCALE 2 +Datum +fixeddecimal2varchar(PG_FUNCTION_ARGS) +{ + int64 val = PG_GETARG_INT64(0); + int32 maxByteLen = PG_GETARG_INT32(1); + char buf[MAXINT8LEN + 1]; + char *end; + int32 len; + Datum res; + + /* fetch function pointer for cross-module calls. */ + if (fixeddecimal2str_p == NULL) + fixeddecimal2str_p = (fixeddecimal2str_t) + load_external_function("$libdir/babelfishpg_money", "fixeddecimal2str", true, NULL); + + end = fixeddecimal2str_p(val, buf, FIXEDDECIMAL_2_VARCHAR_MULTIPLIER, FIXEDDECIMAL_2_VARCHAR_SCALE); + len = (end - buf); + + if (maxByteLen < 0) + maxByteLen = len + VARHDRSZ; + maxByteLen -= VARHDRSZ; + if (len > maxByteLen) + ereport(ERROR, + (errcode(ERRCODE_STRING_DATA_RIGHT_TRUNCATION), + errmsg("There is insufficient result space to convert a money/smallmoney value to varchar/nvarchar."))); + + res = DirectFunctionCall3(varcharin, + CStringGetDatum(buf), + ObjectIdGetDatum(0), + Int32GetDatum(-1)); + + PG_RETURN_DATUM(res); +} + +Datum +fixeddecimal2bpchar(PG_FUNCTION_ARGS) +{ + int64 val = PG_GETARG_INT64(0); + int32 maxByteLen = PG_GETARG_INT32(1); + char buf[MAXINT8LEN + 1]; + char *buf_padded; + char *end; + int32 len; + Datum res; + + /* fetch function pointer for cross-module calls. */ + if (fixeddecimal2str_p == NULL) + fixeddecimal2str_p = (fixeddecimal2str_t) + load_external_function("$libdir/babelfishpg_money", "fixeddecimal2str", true, NULL); + + end = fixeddecimal2str_p(val, buf, FIXEDDECIMAL_2_VARCHAR_MULTIPLIER, FIXEDDECIMAL_2_VARCHAR_SCALE); + len = (end - buf); + + if (maxByteLen < 0) + maxByteLen = len + VARHDRSZ; + maxByteLen -= VARHDRSZ; + if (len > maxByteLen) + ereport(ERROR, + (errcode(ERRCODE_STRING_DATA_RIGHT_TRUNCATION), + errmsg("There is insufficient result space to convert a money/smallmoney value to varchar/nvarchar."))); + + /* Left pad money value with the spaces */ + buf_padded = (char *) palloc(maxByteLen + 1); + memset(buf_padded, ' ', maxByteLen - len); + memcpy(buf_padded + maxByteLen - len, buf, len); + buf_padded[maxByteLen] = '\0'; + res = DirectFunctionCall3(bpcharin, + CStringGetDatum(buf_padded), + ObjectIdGetDatum(0), + Int32GetDatum(-1)); + + PG_RETURN_DATUM(res); +} +#undef FIXEDDECIMAL_2_VARCHAR_MULTIPLIER +#undef FIXEDDECIMAL_2_VARCHAR_SCALE + /***************************************************************************** * bpchar - char() * *****************************************************************************/ diff --git a/contrib/babelfishpg_money/fixeddecimal.c b/contrib/babelfishpg_money/fixeddecimal.c index a07c64a743..f7abd93f9e 100755 --- a/contrib/babelfishpg_money/fixeddecimal.c +++ b/contrib/babelfishpg_money/fixeddecimal.c @@ -232,6 +232,9 @@ static int64 scanfixeddecimal(const char *str, int *precision, int *scale); static FixedDecimalAggState *makeFixedDecimalAggState(FunctionCallInfo fcinfo); static void fixeddecimal_accum(FixedDecimalAggState *state, int64 newval); static int64 int8fixeddecimal_internal(int64 arg, const char *typename); +extern PGDLLEXPORT char *fixeddecimal2str(int64 val, char *buffer, + int64 fixeddecimal_multiplier, + int64 fixeddecimal_scale); /*********************************************************************** ** @@ -392,12 +395,31 @@ pg_int64tostr_zeropad(char *str, int64 value, int64 padding) * Prints the fixeddecimal 'val' to buffer as a string. * Returns a pointer to the end of the written string. */ -static char * -fixeddecimal2str(int64 val, char *buffer) +char * +fixeddecimal2str(int64 val, char *buffer, + int64 fixeddecimal_multiplier, + int64 fixeddecimal_scale) { char *ptr = buffer; - int64 integralpart = val / FIXEDDECIMAL_MULTIPLIER; - int64 fractionalpart = val % FIXEDDECIMAL_MULTIPLIER; + int64 integralpart; + int64 fractionalpart; + + /* + * By default, fixeddecimal contains 4 digits after decimal but if we only need + * 2 decimal points, remove last two decimal digits, round off remaining value. + */ + if (fixeddecimal_scale < 4) + { + int64 scale_factor = FIXEDDECIMAL_MULTIPLIER / (fixeddecimal_multiplier * 10); + int64 last_digit = abs(val / scale_factor) % 10; + + val = val / fixeddecimal_multiplier; + if (last_digit >= 5) + val = val >= 0 ? val + 1LL : val - 1LL; + } + + integralpart = val / fixeddecimal_multiplier; + fractionalpart = val % fixeddecimal_multiplier; if (val < 0) { @@ -413,7 +435,7 @@ fixeddecimal2str(int64 val, char *buffer) } ptr = pg_int64tostr(ptr, integralpart); *ptr++ = '.'; - ptr = pg_int64tostr_zeropad(ptr, fractionalpart, FIXEDDECIMAL_SCALE); + ptr = pg_int64tostr_zeropad(ptr, fractionalpart, fixeddecimal_scale); return ptr; } @@ -810,7 +832,7 @@ fixeddecimalout(PG_FUNCTION_ARGS) { int64 val = PG_GETARG_INT64(0); char buf[MAXINT8LEN + 1]; - char *end = fixeddecimal2str(val, buf); + char *end = fixeddecimal2str(val, buf, FIXEDDECIMAL_MULTIPLIER, FIXEDDECIMAL_SCALE); PG_RETURN_CSTRING(pnstrdup(buf, end - buf)); } @@ -2929,7 +2951,7 @@ fixeddecimalaggstateout(PG_FUNCTION_ARGS) char buf[MAXINT8LEN + 1 + MAXINT8LEN + 1]; char *p; - p = fixeddecimal2str(state->sumX, buf); + p = fixeddecimal2str(state->sumX, buf, FIXEDDECIMAL_MULTIPLIER, FIXEDDECIMAL_SCALE); *p++ = ':'; p = pg_int64tostr(p, state->N); diff --git a/contrib/babelfishpg_tsql/src/pltsql_coerce.c b/contrib/babelfishpg_tsql/src/pltsql_coerce.c index 5ca58b6748..5661b90ecc 100644 --- a/contrib/babelfishpg_tsql/src/pltsql_coerce.c +++ b/contrib/babelfishpg_tsql/src/pltsql_coerce.c @@ -151,6 +151,7 @@ tsql_cast_raw_info_t tsql_cast_raw_infos[] = {TSQL_CAST_ENTRY, "sys", "bpchar", "sys", "fixeddecimal", "char_to_fixeddecimal", 'i', 'f'}, {TSQL_CAST_ENTRY, "pg_catalog", "varchar", "sys", "fixeddecimal", "char_to_fixeddecimal", 'i', 'f'}, {TSQL_CAST_ENTRY, "sys", "varchar", "sys", "fixeddecimal", "char_to_fixeddecimal", 'i', 'f'}, + {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "varchar", "pg_catalog", "varchar", NULL, 'i', 'b'}, /* smalldatetime */ {PG_CAST_ENTRY, "pg_catalog", "date", "sys", "smalldatetime", NULL, 'i', 'f'}, {PG_CAST_ENTRY, "pg_catalog", "time", "sys", "smalldatetime", NULL, 'i', 'f'}, @@ -232,6 +233,11 @@ tsql_cast_raw_info_t tsql_cast_raw_infos[] = {TSQL_CAST_ENTRY, "sys", "bpchar", "pg_catalog", "name", "bpchar_to_name", 'i', 'f'}, {TSQL_CAST_ENTRY, "pg_catalog", "varchar", "pg_catalog", "name", "varchar_to_name", 'i', 'f'}, {TSQL_CAST_ENTRY, "sys", "varchar", "pg_catalog", "name", "varchar_to_name", 'i', 'f'}, +/* fixeddecimal */ + {PG_CAST_ENTRY, "sys", "fixeddecimal", "pg_catalog", "bpchar", NULL, 'i', 'f'}, + {PG_CAST_ENTRY, "sys", "fixeddecimal", "sys", "bpchar", NULL, 'i', 'f'}, + {PG_CAST_ENTRY, "sys", "fixeddecimal", "pg_catalog", "varchar", NULL, 'i', 'f'}, + {PG_CAST_ENTRY, "sys", "fixeddecimal", "sys", "varchar", NULL, 'i', 'f'}, /* string -> float8 via I/O */ {TSQL_CAST_WITHOUT_FUNC_ENTRY, "pg_catalog", "text", "pg_catalog", "float8", NULL, 'i', 'i'}, {TSQL_CAST_WITHOUT_FUNC_ENTRY, "pg_catalog", "bpchar", "pg_catalog", "float8", NULL, 'i', 'i'}, @@ -302,11 +308,7 @@ tsql_cast_raw_info_t tsql_cast_raw_infos[] = {TSQL_CAST_WITHOUT_FUNC_ENTRY, "pg_catalog", "numeric", "sys", "varchar", NULL, 'i', 'i'}, /* // fixeddecimal -> string via I/O */ {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "fixeddecimal", "pg_catalog", "text", NULL, 'i', 'i'}, - {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "fixeddecimal", "pg_catalog", "bpchar", NULL, 'i', 'i'}, - {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "fixeddecimal", "sys", "bpchar", NULL, 'i', 'i'}, - {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "fixeddecimal", "pg_catalog", "varchar", NULL, 'i', 'i'}, - {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "fixeddecimal", "sys", "varchar", NULL, 'i', 'i'}, -/* fixeddecimal -> string via I/O */ +/* uniqueidentifier -> string via I/O */ {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "uniqueidentifier", "pg_catalog", "text", NULL, 'i', 'i'}, {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "uniqueidentifier", "pg_catalog", "bpchar", NULL, 'i', 'i'}, {TSQL_CAST_WITHOUT_FUNC_ENTRY, "sys", "uniqueidentifier", "sys", "bpchar", NULL, 'i', 'i'}, diff --git a/test/JDBC/expected/BABEL-1193.out b/test/JDBC/expected/BABEL-1193.out index 848a004b30..5f992ada80 100644 --- a/test/JDBC/expected/BABEL-1193.out +++ b/test/JDBC/expected/BABEL-1193.out @@ -221,9 +221,9 @@ SELECT * FROM t14; GO ~~START~~ varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -12#!#4553#!#123456#!#12.345#!#2344.456#!#12.34#!#456.3334#!#1123.6777 --12#!#-1234#!#-123456#!#-12.345#!#-2344.456#!#12.34#!#-456.3334#!#-1123.6777 -0#!#0#!#0#!#0#!#0#!#0.00#!#0.0000#!#0.0000 +12#!#4553#!#123456#!#12.345#!#2344.456#!#12.34#!#456.33#!#1123.68 +-12#!#-1234#!#-123456#!#-12.345#!#-2344.456#!#12.34#!#-456.33#!#-1123.68 +0#!#0#!#0#!#0#!#0#!#0.00#!#0.00#!#0.00 ~~END~~ -- numeric types -> char(10) @@ -237,9 +237,9 @@ SELECT * FROM t15; GO ~~START~~ char#!#char#!#char#!#char#!#char#!#char#!#char#!#char -12 #!#4553 #!#123456 #!#12.345 #!#2344.456 #!#12.34 #!#456.3334 #!#1123.6777 --12 #!#-1234 #!#-123456 #!#-12.345 #!#-2344.456 #!#12.34 #!#-456.3334 #!#-1123.6777 -0 #!#0 #!#0 #!#0 #!#0 #!#0.00 #!#0.0000 #!#0.0000 +12 #!#4553 #!#123456 #!#12.345 #!#2344.456 #!#12.34 #!# 456.33#!# 1123.68 +-12 #!#-1234 #!#-123456 #!#-12.345 #!#-2344.456 #!#12.34 #!# -456.33#!# -1123.68 +0 #!#0 #!#0 #!#0 #!#0 #!#0.00 #!# 0.00#!# 0.00 ~~END~~ @@ -248,7 +248,7 @@ select upper(cast (1 as smallint)), upper(cast (1 as int)), upper(cast (1 as big GO ~~START~~ varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -1#!#1#!#1#!#1#!#1#!#2.1#!#1.0000#!#1.0000 +1#!#1#!#1#!#1#!#1#!#2.1#!#1.00#!#1.00 ~~END~~ select round(cast ('123' as text), 1), round(cast ('123' as char(3)), 1), round(cast ('123' as varchar(3)), 1); diff --git a/test/JDBC/expected/BABEL-3486-vu-verify.out b/test/JDBC/expected/BABEL-3486-vu-verify.out index eb9aa3f286..e0b56bb188 100644 --- a/test/JDBC/expected/BABEL-3486-vu-verify.out +++ b/test/JDBC/expected/BABEL-3486-vu-verify.out @@ -1586,7 +1586,7 @@ SELECT * FROM BABEL_3486_vu_prepare_v63 GO ~~START~~ varchar -1.0000 +1.00 ~~END~~ DROP VIEW BABEL_3486_vu_prepare_v63 @@ -1596,7 +1596,7 @@ EXEC BABEL_3486_vu_prepare_p63 GO ~~START~~ varchar -1.0000 +1.00 ~~END~~ DROP PROCEDURE BABEL_3486_vu_prepare_p63 diff --git a/test/JDBC/expected/BABEL-889-vu-verify.out b/test/JDBC/expected/BABEL-889-vu-verify.out index 76f087626a..56422dd062 100644 --- a/test/JDBC/expected/BABEL-889-vu-verify.out +++ b/test/JDBC/expected/BABEL-889-vu-verify.out @@ -131,7 +131,7 @@ select cast(cast(cast('$123.123' as money) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- smallmoney @@ -146,7 +146,7 @@ select cast(cast(cast('$123.123' as smallmoney) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- bigint diff --git a/test/JDBC/expected/BABEL-889.out b/test/JDBC/expected/BABEL-889.out index 76f087626a..56422dd062 100644 --- a/test/JDBC/expected/BABEL-889.out +++ b/test/JDBC/expected/BABEL-889.out @@ -131,7 +131,7 @@ select cast(cast(cast('$123.123' as money) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- smallmoney @@ -146,7 +146,7 @@ select cast(cast(cast('$123.123' as smallmoney) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- bigint diff --git a/test/JDBC/expected/babel_functions_cast.out b/test/JDBC/expected/babel_functions_cast.out index 92873f395f..02d3da20ba 100644 --- a/test/JDBC/expected/babel_functions_cast.out +++ b/test/JDBC/expected/babel_functions_cast.out @@ -127,14 +127,14 @@ select CAST(CAST(4936.56 AS MONEY) AS varchar(10)); GO ~~START~~ varchar -4936.5600 +4936.56 ~~END~~ select CAST(CAST(-4936.56 AS MONEY) AS varchar(10)); GO ~~START~~ varchar --4936.5600 +-4936.56 ~~END~~ select CAST(4936.56 AS smallmoney); @@ -955,14 +955,14 @@ select TRY_CAST(TRY_CAST(4936.56 AS MONEY) AS varchar(10)); GO ~~START~~ varchar -4936.5600 +4936.56 ~~END~~ select TRY_CAST(TRY_CAST(-4936.56 AS MONEY) AS varchar(10)); GO ~~START~~ varchar --4936.5600 +-4936.56 ~~END~~ select TRY_CAST(4936.56 AS smallmoney); diff --git a/test/JDBC/expected/babelfish_function_ext-before_16_4_or_15_8_or_14_13-vu-verify.out b/test/JDBC/expected/babelfish_function_ext-before_16_4_or_15_8_or_14_13-vu-verify.out index 41cfe25c3f..1ef6b100c9 100644 --- a/test/JDBC/expected/babelfish_function_ext-before_16_4_or_15_8_or_14_13-vu-verify.out +++ b/test/JDBC/expected/babelfish_function_ext-before_16_4_or_15_8_or_14_13-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/babelfish_function_ext-vu-verify.out b/test/JDBC/expected/babelfish_function_ext-vu-verify.out index 301309e561..38839f2290 100644 --- a/test/JDBC/expected/babelfish_function_ext-vu-verify.out +++ b/test/JDBC/expected/babelfish_function_ext-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/concat-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/concat-before-15_9-or-16_5-vu-verify.out index c9e37d55cc..ad8c38422d 100644 --- a/test/JDBC/expected/concat-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/concat-before-15_9-or-16_5-vu-verify.out @@ -653,16 +653,16 @@ SELECT CONCAT(col_varchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -??·?15.0000 -??16.0000 +abc12.00 +?defghi13.00 +??14.00 +??·?15.00 +??16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -670,16 +670,16 @@ SELECT CONCAT(col_varchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -??·?15.0000 -??16.0000 +abc12.00 +?defghi13.00 +??14.00 +??·?15.00 +??16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1129,16 +1129,16 @@ SELECT CONCAT(col_nvarchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY i GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1146,16 +1146,16 @@ SELECT CONCAT(col_nvarchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1535,16 +1535,16 @@ EXEC babel_3409_concat_dep_proc2 GO ~~START~~ nvarchar -abc12.00002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 -🙂defghi13.00002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 -🙂🙂14.00002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 -比尔·拉15.00002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 -莫斯16.00002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 +abc12.002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 +🙂defghi13.002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 +🙂🙂14.002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 +比尔·拉15.002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 +莫斯16.002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 -Anikait17.00002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 +Anikait17.002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 -Agrawal18.00002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 +Agrawal18.002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/concat-vu-prepare.out b/test/JDBC/expected/concat-vu-prepare.out index dde309fd88..6d8ec2e22c 100644 --- a/test/JDBC/expected/concat-vu-prepare.out +++ b/test/JDBC/expected/concat-vu-prepare.out @@ -466,7 +466,7 @@ RETURN (SELECT TOP 1 CONCAT(col_nvarchar, col_nchar, col_int, col_bigint, col_sm GO CREATE VIEW babel_3409_concat_dep_view2 AS - SELECT CONCAT(col_nvarchar, col_nchar, col_varchar, col_decimal, col_smallmoney, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_t1 + SELECT CONCAT(col_nvarchar, col_nchar, col_varchar, col_decimal, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_t1 GO CREATE PROCEDURE babel_3409_concat_dep_proc2 AS diff --git a/test/JDBC/expected/concat-vu-verify.out b/test/JDBC/expected/concat-vu-verify.out index b16ab92ee7..9d98187e47 100644 --- a/test/JDBC/expected/concat-vu-verify.out +++ b/test/JDBC/expected/concat-vu-verify.out @@ -783,16 +783,16 @@ SELECT CONCAT(col_varchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -??·?15.0000 -??16.0000 +abc12.00 +?defghi13.00 +??14.00 +??·?15.00 +??16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -800,16 +800,16 @@ SELECT CONCAT(col_varchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -??·?15.0000 -??16.0000 +abc12.00 +?defghi13.00 +??14.00 +??·?15.00 +??16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1395,16 +1395,16 @@ SELECT CONCAT(col_nvarchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY i GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1412,16 +1412,16 @@ SELECT CONCAT(col_nvarchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1835,16 +1835,16 @@ SELECT * FROM babel_3409_concat_dep_view2 GO ~~START~~ nvarchar -abcabc abc1212.00002000-12-12 12:43:00 -🙂defghi🙂defghi 🙂defghi1313.00002000-12-13 12:43:00 -🙂🙂🙂🙂 🙂🙂1414.00002000-12-14 12:43:00 -比尔·拉比尔·拉 比尔·拉1515.00002000-12-15 12:43:00 -莫斯莫斯 莫斯1616.00002000-12-16 12:43:00 +abcabc abc122000-12-12 12:43:00 +🙂defghi🙂defghi 🙂defghi132000-12-13 12:43:00 +🙂🙂🙂🙂 🙂🙂142000-12-14 12:43:00 +比尔·拉比尔·拉 比尔·拉152000-12-15 12:43:00 +莫斯莫斯 莫斯162000-12-16 12:43:00 -AnikaitAnikait Anikait1717.00002000-12-17 12:43:00 +AnikaitAnikait Anikait172000-12-17 12:43:00 -AgrawalAgrawal Agrawal1818.00002000-12-18 12:43:00 +AgrawalAgrawal Agrawal182000-12-18 12:43:00 ~~END~~ @@ -1852,16 +1852,16 @@ EXEC babel_3409_concat_dep_proc2 GO ~~START~~ nvarchar -abc12.00002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 -🙂defghi13.00002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 -🙂🙂14.00002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 -比尔·拉15.00002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 -莫斯16.00002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 +abc12.002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 +🙂defghi13.002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 +🙂🙂14.002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 +比尔·拉15.002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 +莫斯16.002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 -Anikait17.00002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 +Anikait17.002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 -Agrawal18.00002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 +Agrawal18.002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/concat_ws-before-15_5-or-14_10-vu-verify.out b/test/JDBC/expected/concat_ws-before-15_5-or-14_10-vu-verify.out index fab23d4805..4bcbb450a8 100644 --- a/test/JDBC/expected/concat_ws-before-15_5-or-14_10-vu-verify.out +++ b/test/JDBC/expected/concat_ws-before-15_5-or-14_10-vu-verify.out @@ -1244,16 +1244,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1261,16 +1261,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1278,16 +1278,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1295,16 +1295,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2196,16 +2196,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2213,16 +2213,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2230,16 +2230,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2247,16 +2247,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2911,16 +2911,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -??·?15.0000??·? -??16.0000?? +abc12.00abc +?defghi13.00?defghi +??14.00?? +??·?15.00??·? +??16.00?? -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -2928,16 +2928,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -??·?15.0000??·? -??16.0000?? +abc12.00abc +?defghi13.00?defghi +??14.00?? +??·?15.00??·? +??16.00?? -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3324,16 +3324,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/concat_ws-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/concat_ws-before-15_9-or-16_5-vu-verify.out index 3ce0da6e95..4c7a22a10b 100644 --- a/test/JDBC/expected/concat_ws-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/concat_ws-before-15_9-or-16_5-vu-verify.out @@ -1244,16 +1244,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1261,16 +1261,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1278,16 +1278,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1295,16 +1295,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2196,16 +2196,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2213,16 +2213,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2230,16 +2230,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2247,16 +2247,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2911,16 +2911,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -??·?15.0000??·? -??16.0000?? +abc12.00abc +?defghi13.00?defghi +??14.00?? +??·?15.00??·? +??16.00?? -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -2928,16 +2928,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -??·?15.0000??·? -??16.0000?? +abc12.00abc +?defghi13.00?defghi +??14.00?? +??·?15.00??·? +??16.00?? -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3324,16 +3324,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/concat_ws-vu-prepare.out b/test/JDBC/expected/concat_ws-vu-prepare.out index 0a2158e480..c0792e9edd 100644 --- a/test/JDBC/expected/concat_ws-vu-prepare.out +++ b/test/JDBC/expected/concat_ws-vu-prepare.out @@ -466,7 +466,7 @@ RETURN (SELECT TOP 1 CONCAT_WS('-', col_nvarchar, col_nchar, col_int, col_bigint GO CREATE VIEW babel_3409_concat_ws_dep_view2 AS - SELECT CONCAT_WS(N'-', col_nvarchar, col_nchar, col_varchar, col_decimal, col_smallmoney, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_ws_t1 + SELECT CONCAT_WS(N'-', col_nvarchar, col_nchar, col_varchar, col_decimal, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_ws_t1 GO CREATE PROCEDURE babel_3409_concat_ws_dep_proc2 AS diff --git a/test/JDBC/expected/concat_ws-vu-verify.out b/test/JDBC/expected/concat_ws-vu-verify.out index 166a1881ce..d50fe5c3c5 100644 --- a/test/JDBC/expected/concat_ws-vu-verify.out +++ b/test/JDBC/expected/concat_ws-vu-verify.out @@ -1391,16 +1391,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1408,16 +1408,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1425,16 +1425,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1442,16 +1442,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2547,16 +2547,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2564,16 +2564,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2581,16 +2581,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2598,16 +2598,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -3381,16 +3381,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -??·?15.0000??·? -??16.0000?? +abc12.00abc +?defghi13.00?defghi +??14.00?? +??·?15.00??·? +??16.00?? -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3398,16 +3398,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -??·?15.0000??·? -??16.0000?? +abc12.00abc +?defghi13.00?defghi +??14.00?? +??·?15.00??·? +??16.00?? -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3791,16 +3791,16 @@ SELECT * FROM babel_3409_concat_ws_dep_view2 GO ~~START~~ nvarchar -abc-abc -abc-12-12.0000-2000-12-12 12:43:00 -🙂defghi-🙂defghi -🙂defghi-13-13.0000-2000-12-13 12:43:00 -🙂🙂-🙂🙂 -🙂🙂-14-14.0000-2000-12-14 12:43:00 -比尔·拉-比尔·拉 -比尔·拉-15-15.0000-2000-12-15 12:43:00 -莫斯-莫斯 -莫斯-16-16.0000-2000-12-16 12:43:00 +abc-abc -abc-12-2000-12-12 12:43:00 +🙂defghi-🙂defghi -🙂defghi-13-2000-12-13 12:43:00 +🙂🙂-🙂🙂 -🙂🙂-14-2000-12-14 12:43:00 +比尔·拉-比尔·拉 -比尔·拉-15-2000-12-15 12:43:00 +莫斯-莫斯 -莫斯-16-2000-12-16 12:43:00 -Anikait-Anikait -Anikait-17-17.0000-2000-12-17 12:43:00 +Anikait-Anikait -Anikait-17-2000-12-17 12:43:00 -Agrawal-Agrawal -Agrawal-18-18.0000-2000-12-18 12:43:00 +Agrawal-Agrawal -Agrawal-18-2000-12-18 12:43:00 ~~END~~ @@ -3808,16 +3808,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/latest__verification_cleanup__14_10__BABEL-2877-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__14_10__BABEL-2877-vu-verify.out index 5970f8ab19..1c68e6e58e 100644 --- a/test/JDBC/expected/latest__verification_cleanup__14_10__BABEL-2877-vu-verify.out +++ b/test/JDBC/expected/latest__verification_cleanup__14_10__BABEL-2877-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/latest__verification_cleanup__14_6__BABEL-2877-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__14_6__BABEL-2877-vu-verify.out index 5970f8ab19..1c68e6e58e 100644 --- a/test/JDBC/expected/latest__verification_cleanup__14_6__BABEL-2877-vu-verify.out +++ b/test/JDBC/expected/latest__verification_cleanup__14_6__BABEL-2877-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/latest__verification_cleanup__14_7__BABEL-2877-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__14_7__BABEL-2877-vu-verify.out index 5970f8ab19..1c68e6e58e 100644 --- a/test/JDBC/expected/latest__verification_cleanup__14_7__BABEL-2877-vu-verify.out +++ b/test/JDBC/expected/latest__verification_cleanup__14_7__BABEL-2877-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/latest__verification_cleanup__14_8__BABEL-2877-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__14_8__BABEL-2877-vu-verify.out index 5970f8ab19..1c68e6e58e 100644 --- a/test/JDBC/expected/latest__verification_cleanup__14_8__BABEL-2877-vu-verify.out +++ b/test/JDBC/expected/latest__verification_cleanup__14_8__BABEL-2877-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/latest__verification_cleanup__14_9__BABEL-2877-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__14_9__BABEL-2877-vu-verify.out index 5970f8ab19..1c68e6e58e 100644 --- a/test/JDBC/expected/latest__verification_cleanup__14_9__BABEL-2877-vu-verify.out +++ b/test/JDBC/expected/latest__verification_cleanup__14_9__BABEL-2877-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/latest__verification_cleanup__15_1__BABEL-2877-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__15_1__BABEL-2877-vu-verify.out index 5970f8ab19..1c68e6e58e 100644 --- a/test/JDBC/expected/latest__verification_cleanup__15_1__BABEL-2877-vu-verify.out +++ b/test/JDBC/expected/latest__verification_cleanup__15_1__BABEL-2877-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/latest__verification_cleanup__15_2__BABEL-2877-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__15_2__BABEL-2877-vu-verify.out index 5970f8ab19..1c68e6e58e 100644 --- a/test/JDBC/expected/latest__verification_cleanup__15_2__BABEL-2877-vu-verify.out +++ b/test/JDBC/expected/latest__verification_cleanup__15_2__BABEL-2877-vu-verify.out @@ -57,7 +57,7 @@ SELECT * FROM babel_2877_vu_prepare_func1(10, 'abc', $5); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -65,7 +65,7 @@ SELECT * FROM babel_2877_vu_prepare_func2(); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -80,7 +80,7 @@ SELECT * FROM babel_2877_vu_prepare_func3(10, 'abc', $5, 1.2); GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -88,7 +88,7 @@ SELECT * FROM babel_2877_vu_prepare_view1; GO ~~START~~ varchar -20def5.00001.2 +20def5.001.2 ~~END~~ @@ -96,7 +96,7 @@ SELECT * FROM babel_2877_vu_prepare_view2; GO ~~START~~ varchar -10abc5.00001.2 +10abc5.001.2 ~~END~~ @@ -104,7 +104,7 @@ SELECT * FROM babel_2877_vu_prepare_view3; GO ~~START~~ varchar -20def10.00001.8 +20def10.001.8 ~~END~~ diff --git a/test/JDBC/expected/ltrim-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/ltrim-before-15_8-or-16_4-vu-verify.out index 4292319c3f..fd9cef9bc8 100644 --- a/test/JDBC/expected/ltrim-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/ltrim-before-15_8-or-16_4-vu-verify.out @@ -491,7 +491,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -500,7 +500,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/ltrim-vu-verify.out b/test/JDBC/expected/ltrim-vu-verify.out index 5fa455acd6..608bb703b8 100644 --- a/test/JDBC/expected/ltrim-vu-verify.out +++ b/test/JDBC/expected/ltrim-vu-verify.out @@ -609,7 +609,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -618,7 +618,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889-vu-verify.out index 0bf3b6917d..99fe97cd61 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889-vu-verify.out @@ -131,7 +131,7 @@ select cast(cast(cast('$123.123' as money) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- smallmoney @@ -146,7 +146,7 @@ select cast(cast(cast('$123.123' as smallmoney) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- bigint diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889.out index 0bf3b6917d..99fe97cd61 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-889.out @@ -131,7 +131,7 @@ select cast(cast(cast('$123.123' as money) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- smallmoney @@ -146,7 +146,7 @@ select cast(cast(cast('$123.123' as smallmoney) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- bigint diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-before-15_9-or-16_5-vu-verify.out index 80e6cb0562..6d9ad21817 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-before-15_9-or-16_5-vu-verify.out @@ -653,16 +653,16 @@ SELECT CONCAT(col_varchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +?defghi13.00 +??14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -670,16 +670,16 @@ SELECT CONCAT(col_varchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +?defghi13.00 +??14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1129,16 +1129,16 @@ SELECT CONCAT(col_nvarchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY i GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1146,16 +1146,16 @@ SELECT CONCAT(col_nvarchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1535,16 +1535,16 @@ EXEC babel_3409_concat_dep_proc2 GO ~~START~~ nvarchar -abc12.00002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 -🙂defghi13.00002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 -🙂🙂14.00002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 -比尔·拉15.00002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 -莫斯16.00002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 +abc12.002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 +🙂defghi13.002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 +🙂🙂14.002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 +比尔·拉15.002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 +莫斯16.002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 -Anikait17.00002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 +Anikait17.002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 -Agrawal18.00002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 +Agrawal18.002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-vu-verify.out index c15f965aa0..eb8fed6616 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat-vu-verify.out @@ -783,16 +783,16 @@ SELECT CONCAT(col_varchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +?defghi13.00 +??14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -800,16 +800,16 @@ SELECT CONCAT(col_varchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +?defghi13.00 +??14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1395,16 +1395,16 @@ SELECT CONCAT(col_nvarchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY i GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1412,16 +1412,16 @@ SELECT CONCAT(col_nvarchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1835,16 +1835,16 @@ SELECT * FROM babel_3409_concat_dep_view2 GO ~~START~~ nvarchar -abcabc abc1212.00002000-12-12 12:43:00 -🙂defghi🙂defghi 🙂defghi1313.00002000-12-13 12:43:00 -🙂🙂🙂🙂 🙂🙂1414.00002000-12-14 12:43:00 -比尔·拉比尔·拉 比尔·拉1515.00002000-12-15 12:43:00 -莫斯莫斯 莫斯1616.00002000-12-16 12:43:00 +abcabc abc122000-12-12 12:43:00 +🙂defghi🙂defghi 🙂defghi132000-12-13 12:43:00 +🙂🙂🙂🙂 🙂🙂142000-12-14 12:43:00 +比尔·拉比尔·拉 比尔·拉152000-12-15 12:43:00 +莫斯莫斯 莫斯162000-12-16 12:43:00 -AnikaitAnikait Anikait1717.00002000-12-17 12:43:00 +AnikaitAnikait Anikait172000-12-17 12:43:00 -AgrawalAgrawal Agrawal1818.00002000-12-18 12:43:00 +AgrawalAgrawal Agrawal182000-12-18 12:43:00 ~~END~~ @@ -1852,16 +1852,16 @@ EXEC babel_3409_concat_dep_proc2 GO ~~START~~ nvarchar -abc12.00002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 -🙂defghi13.00002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 -🙂🙂14.00002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 -比尔·拉15.00002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 -莫斯16.00002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 +abc12.002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 +🙂defghi13.002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 +🙂🙂14.002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 +比尔·拉15.002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 +莫斯16.002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 -Anikait17.00002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 +Anikait17.002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 -Agrawal18.00002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 +Agrawal18.002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out index 8fd209421e..cfbdbca591 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out @@ -1244,16 +1244,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1261,16 +1261,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1278,16 +1278,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1295,16 +1295,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2196,16 +2196,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2213,16 +2213,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2230,16 +2230,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2247,16 +2247,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2911,16 +2911,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比尔·拉15.0000比尔·拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比尔·拉15.00比尔·拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -2928,16 +2928,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比尔·拉15.0000比尔·拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比尔·拉15.00比尔·拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3316,16 +3316,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out index 06ae85be2a..630b17e5cd 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out @@ -1244,16 +1244,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1261,16 +1261,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1278,16 +1278,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1295,16 +1295,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2196,16 +2196,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2213,16 +2213,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2230,16 +2230,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2247,16 +2247,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2911,16 +2911,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比尔·拉15.0000比尔·拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比尔·拉15.00比尔·拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -2928,16 +2928,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比尔·拉15.0000比尔·拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比尔·拉15.00比尔·拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3324,16 +3324,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-vu-verify.out index a4472478d1..65343b8eb5 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/concat_ws-vu-verify.out @@ -1391,16 +1391,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1408,16 +1408,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1425,16 +1425,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1442,16 +1442,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2547,16 +2547,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2564,16 +2564,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2581,16 +2581,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2598,16 +2598,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -3381,16 +3381,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比尔·拉15.0000比尔·拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比尔·拉15.00比尔·拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3398,16 +3398,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比尔·拉15.0000比尔·拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比尔·拉15.00比尔·拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3791,16 +3791,16 @@ SELECT * FROM babel_3409_concat_ws_dep_view2 GO ~~START~~ nvarchar -abc-abc -abc-12-12.0000-2000-12-12 12:43:00 -🙂defghi-🙂defghi -🙂defghi-13-13.0000-2000-12-13 12:43:00 -🙂🙂-🙂🙂 -🙂🙂-14-14.0000-2000-12-14 12:43:00 -比尔·拉-比尔·拉 -比尔·拉-15-15.0000-2000-12-15 12:43:00 -莫斯-莫斯 -莫斯-16-16.0000-2000-12-16 12:43:00 +abc-abc -abc-12-2000-12-12 12:43:00 +🙂defghi-🙂defghi -🙂defghi-13-2000-12-13 12:43:00 +🙂🙂-🙂🙂 -🙂🙂-14-2000-12-14 12:43:00 +比尔·拉-比尔·拉 -比尔·拉-15-2000-12-15 12:43:00 +莫斯-莫斯 -莫斯-16-2000-12-16 12:43:00 -Anikait-Anikait -Anikait-17-17.0000-2000-12-17 12:43:00 +Anikait-Anikait -Anikait-17-2000-12-17 12:43:00 -Agrawal-Agrawal -Agrawal-18-18.0000-2000-12-18 12:43:00 +Agrawal-Agrawal -Agrawal-18-2000-12-18 12:43:00 ~~END~~ @@ -3808,16 +3808,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out index 42e753c22a..8020bb4740 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out @@ -491,7 +491,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -500,7 +500,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-vu-verify.out index bc81221949..b697b3ef94 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/ltrim-vu-verify.out @@ -609,7 +609,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -618,7 +618,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-14_3-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-14_3-vu-verify.out index 316fa21cd4..5628dcdee2 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-14_3-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-14_3-vu-verify.out @@ -2624,7 +2624,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2642,7 +2642,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2651,7 +2651,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2669,7 +2669,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-15_8-or-16_4-vu-verify.out index a10f0c2513..5b3a56aec6 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-before-15_8-or-16_4-vu-verify.out @@ -2622,7 +2622,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2640,7 +2640,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2649,7 +2649,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2667,7 +2667,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-vu-verify.out index 432a6c14b4..033468b944 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replace-vu-verify.out @@ -2768,7 +2768,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2786,7 +2786,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2795,7 +2795,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2813,7 +2813,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-before-15_8-or-16_4-vu-verify.out index 395a572fb2..a19f9cbb8d 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-before-15_8-or-16_4-vu-verify.out @@ -539,7 +539,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ @@ -548,7 +548,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-vu-verify.out index baf6a266ed..9175257b4f 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/replicate-vu-verify.out @@ -657,7 +657,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ @@ -666,7 +666,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-before-15_8-or-16_4-vu-verify.out index 74a949d90a..b45094bd42 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-before-15_8-or-16_4-vu-verify.out @@ -483,7 +483,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ @@ -492,7 +492,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-vu-verify.out index 82620dd1a2..0328cf3964 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/reverse-vu-verify.out @@ -601,7 +601,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ @@ -610,7 +610,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-before-15_8-or-16_4-vu-verify.out index 043267f716..c290ac64cf 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-before-15_8-or-16_4-vu-verify.out @@ -597,7 +597,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ @@ -606,7 +606,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-vu-verify.out index 74d7270b64..729df77d2f 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/right-vu-verify.out @@ -715,7 +715,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ @@ -724,7 +724,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out index 953bb9ee4d..82e7efd438 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out @@ -491,7 +491,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -500,7 +500,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-vu-verify.out index 993199a69e..feed927616 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/rtrim-vu-verify.out @@ -609,7 +609,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -618,7 +618,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-14_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-14_5-vu-verify.out index 2371e5d234..5c129cb454 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-14_5-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-14_5-vu-verify.out @@ -1063,10 +1063,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1075,10 +1075,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1087,10 +1087,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1099,10 +1099,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out index e6631f099a..18b42591b9 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out @@ -1063,10 +1063,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1075,10 +1075,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1087,10 +1087,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1099,10 +1099,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_9-or-16_5-vu-verify.out index 91da420778..189fba02b5 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-before-15_9-or-16_5-vu-verify.out @@ -1064,10 +1064,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1076,10 +1076,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1088,10 +1088,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1100,10 +1100,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-vu-verify.out index 690dfdf0fd..f4c67f664a 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/string_agg-vu-verify.out @@ -1163,10 +1163,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1175,10 +1175,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1187,10 +1187,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1199,10 +1199,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-before-15_8-or-16_4-vu-verify.out index 58f08dfd9b..a1280a28a7 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-before-15_8-or-16_4-vu-verify.out @@ -2378,7 +2378,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString money = 12356; @@ -2402,7 +2402,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ @@ -2411,7 +2411,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString smallmoney = 12356; @@ -2435,7 +2435,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-vu-verify.out index 9d92f965cf..91a21a3d92 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/stuff-vu-verify.out @@ -2505,7 +2505,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString money = 12356; @@ -2529,7 +2529,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ @@ -2538,7 +2538,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString smallmoney = 12356; @@ -2562,7 +2562,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-before-15_11-or-16_7-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-before-15_11-or-16_7-vu-verify.out index d9b61b8037..8096fe9a32 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-before-15_11-or-16_7-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-before-15_11-or-16_7-vu-verify.out @@ -1621,7 +1621,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -1639,7 +1639,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-vu-verify.out index 568a02d67c..bb4466ec31 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/trim-vu-verify.out @@ -1644,7 +1644,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -1662,7 +1662,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out index b48547bc47..020036ebda 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out @@ -472,12 +472,12 @@ SELECT LOWER(@money) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ @@ -487,12 +487,12 @@ SELECT LOWER(@smallmoney) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-vu-verify.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-vu-verify.out index ed5283f00c..60d9a01196 100644 --- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/upper_lower-vu-verify.out @@ -472,12 +472,12 @@ SELECT LOWER(@money) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ @@ -487,12 +487,12 @@ SELECT LOWER(@smallmoney) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889-vu-verify.out index dcdc766e64..8f5a82e081 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889-vu-verify.out @@ -131,7 +131,7 @@ select cast(cast(cast('$123.123' as money) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- smallmoney @@ -146,7 +146,7 @@ select cast(cast(cast('$123.123' as smallmoney) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- bigint diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889.out index dcdc766e64..8f5a82e081 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-889.out @@ -131,7 +131,7 @@ select cast(cast(cast('$123.123' as money) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- smallmoney @@ -146,7 +146,7 @@ select cast(cast(cast('$123.123' as smallmoney) as sql_variant) as varchar); go ~~START~~ varchar -123.1230 +123.12 ~~END~~ -- bigint diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-before-15_9-or-16_5-vu-verify.out index a693929176..dedd5bbcc2 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-before-15_9-or-16_5-vu-verify.out @@ -653,16 +653,16 @@ SELECT CONCAT(col_varchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -比??拉15.0000 -莫斯16.0000 +abc12.00 +?defghi13.00 +??14.00 +比??拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -670,16 +670,16 @@ SELECT CONCAT(col_varchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar -abc12.0000 -?defghi13.0000 -??14.0000 -比??拉15.0000 -莫斯16.0000 +abc12.00 +?defghi13.00 +??14.00 +比??拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1129,16 +1129,16 @@ SELECT CONCAT(col_nvarchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY i GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1146,16 +1146,16 @@ SELECT CONCAT(col_nvarchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1535,16 +1535,16 @@ EXEC babel_3409_concat_dep_proc2 GO ~~START~~ nvarchar -abc12.00002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 -🙂defghi13.00002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 -🙂🙂14.00002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 -比尔·拉15.00002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 -莫斯16.00002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 +abc12.002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 +🙂defghi13.002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 +🙂🙂14.002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 +比尔·拉15.002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 +莫斯16.002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 -Anikait17.00002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 +Anikait17.002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 -Agrawal18.00002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 +Agrawal18.002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-vu-verify.out index c06311859b..4717d1a510 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat-vu-verify.out @@ -783,16 +783,24 @@ SELECT CONCAT(col_varchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar +<<<<<<< HEAD abc12.0000 ?defghi13.0000 ??14.0000 ??·?15.0000 ??16.0000 +======= +abc12.00 +?defghi13.00 +??14.00 +比??拉15.00 +莫斯16.00 +>>>>>>> 5d3718251 (Fix formatting issue in CAST MONEY to CHAR/VARCHAR (#3367)) -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -800,16 +808,24 @@ SELECT CONCAT(col_varchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ varchar +<<<<<<< HEAD abc12.0000 ?defghi13.0000 ??14.0000 ??·?15.0000 ??16.0000 +======= +abc12.00 +?defghi13.00 +??14.00 +比??拉15.00 +莫斯16.00 +>>>>>>> 5d3718251 (Fix formatting issue in CAST MONEY to CHAR/VARCHAR (#3367)) -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1395,16 +1411,16 @@ SELECT CONCAT(col_nvarchar, col_smallmoney) from babel_3409_concat_t1 ORDER BY i GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1412,16 +1428,16 @@ SELECT CONCAT(col_nvarchar, col_money) from babel_3409_concat_t1 ORDER BY id GO ~~START~~ nvarchar -abc12.0000 -🙂defghi13.0000 -🙂🙂14.0000 -比尔·拉15.0000 -莫斯16.0000 +abc12.00 +🙂defghi13.00 +🙂🙂14.00 +比尔·拉15.00 +莫斯16.00 -Anikait17.0000 +Anikait17.00 -Agrawal18.0000 +Agrawal18.00 ~~END~~ @@ -1835,16 +1851,16 @@ SELECT * FROM babel_3409_concat_dep_view2 GO ~~START~~ nvarchar -abcabc abc1212.00002000-12-12 12:43:00 -🙂defghi🙂defghi 🙂defghi1313.00002000-12-13 12:43:00 -🙂🙂🙂🙂 🙂🙂1414.00002000-12-14 12:43:00 -比尔·拉比尔·拉 比尔·拉1515.00002000-12-15 12:43:00 -莫斯莫斯 莫斯1616.00002000-12-16 12:43:00 +abcabc abc122000-12-12 12:43:00 +🙂defghi🙂defghi 🙂defghi132000-12-13 12:43:00 +🙂🙂🙂🙂 🙂🙂142000-12-14 12:43:00 +比尔·拉比尔·拉 比尔·拉152000-12-15 12:43:00 +莫斯莫斯 莫斯162000-12-16 12:43:00 -AnikaitAnikait Anikait1717.00002000-12-17 12:43:00 +AnikaitAnikait Anikait172000-12-17 12:43:00 -AgrawalAgrawal Agrawal1818.00002000-12-18 12:43:00 +AgrawalAgrawal Agrawal182000-12-18 12:43:00 ~~END~~ @@ -1852,16 +1868,16 @@ EXEC babel_3409_concat_dep_proc2 GO ~~START~~ nvarchar -abc12.00002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 -🙂defghi13.00002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 -🙂🙂14.00002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 -比尔·拉15.00002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 -莫斯16.00002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 +abc12.002000-12-12 12:43:102000-12-12 12:43:10ab2000-12-1212:43:102000-12-12 12:43:10.1234 +10:00 +🙂defghi13.002000-12-13 12:43:102000-12-13 12:43:10cd2000-12-1312:43:102000-12-13 12:43:10.1234 +10:00 +🙂🙂14.002000-12-14 12:43:102000-12-14 12:43:10ef2000-12-1412:43:102000-12-14 12:43:10.1234 +10:00 +比尔·拉15.002000-12-15 12:43:102000-12-15 12:43:10gh2000-12-1512:43:102000-12-15 12:43:10.1234 +10:00 +莫斯16.002000-12-16 12:43:102000-12-16 12:43:10ip2000-12-1612:43:102000-12-16 12:43:10.1234 +10:00 -Anikait17.00002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 +Anikait17.002000-12-17 12:43:102000-12-17 12:43:10qr2000-12-1712:43:102000-12-17 12:43:10.1234 +10:00 -Agrawal18.00002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 +Agrawal18.002000-12-18 12:43:102000-12-18 12:43:10rs2000-12-1812:43:102000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out index e15bc56308..aa6c58cfdb 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_5-or-14_10-vu-verify.out @@ -1244,16 +1244,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比??拉比??拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比??拉比??拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1261,16 +1261,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1278,16 +1278,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比??拉比??拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比??拉比??拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1295,16 +1295,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2196,16 +2196,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2213,16 +2213,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2230,16 +2230,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2247,16 +2247,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2911,16 +2911,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比??拉15.0000比??拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比??拉15.00比??拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -2928,16 +2928,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比??拉15.0000比??拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比??拉15.00比??拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3316,16 +3316,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out index e15bc56308..a6d819baf2 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-before-15_9-or-16_5-vu-verify.out @@ -1244,16 +1244,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比??拉比??拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比??拉比??拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1261,16 +1261,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1278,16 +1278,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -比??拉比??拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +比??拉比??拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1295,16 +1295,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2196,16 +2196,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2213,16 +2213,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2230,16 +2230,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2247,16 +2247,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-vu-verify.out index ad277240a7..19c9dbe61c 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/concat_ws-vu-verify.out @@ -1391,16 +1391,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_smallmoney) from babel_3409_conca GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1408,16 +1408,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1425,16 +1425,16 @@ SELECT CONCAT_WS(col_varchar, col_varchar, col_money) from babel_3409_concat_ws_ GO ~~START~~ varchar -abcabc12.0000 -?defghi?defghi13.0000 -????14.0000 -??·???·?15.0000 -????16.0000 +abcabc12.00 +?defghi?defghi13.00 +????14.00 +??·???·?15.00 +????16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -1442,16 +1442,16 @@ SELECT CONCAT_WS(col_nvarchar, col_varchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2547,16 +2547,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_smallmoney) from babel_3409_conc GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2564,16 +2564,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_smallmoney) from babel_3409_con GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2581,16 +2581,16 @@ SELECT CONCAT_WS(col_varchar, col_nvarchar, col_money) from babel_3409_concat_ws GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -2598,16 +2598,16 @@ SELECT CONCAT_WS(col_nvarchar, col_nvarchar, col_money) from babel_3409_concat_w GO ~~START~~ nvarchar -abcabc12.0000 -🙂defghi🙂defghi13.0000 -🙂🙂🙂🙂14.0000 -比尔·拉比尔·拉15.0000 -莫斯莫斯16.0000 +abcabc12.00 +🙂defghi🙂defghi13.00 +🙂🙂🙂🙂14.00 +比尔·拉比尔·拉15.00 +莫斯莫斯16.00 -AnikaitAnikait17.0000 +AnikaitAnikait17.00 -AgrawalAgrawal18.0000 +AgrawalAgrawal18.00 ~~END~~ @@ -3381,16 +3381,16 @@ SELECT CONCAT_WS(col_smallmoney, col_varchar, col_varchar) from babel_3409_conca GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比??拉15.0000比??拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比??拉15.00比??拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3398,16 +3398,16 @@ SELECT CONCAT_WS(col_money, col_varchar, col_varchar) from babel_3409_concat_ws_ GO ~~START~~ varchar -abc12.0000abc -?defghi13.0000?defghi -??14.0000?? -比??拉15.0000比??拉 -莫斯16.0000莫斯 +abc12.00abc +?defghi13.00?defghi +??14.00?? +比??拉15.00比??拉 +莫斯16.00莫斯 -Anikait17.0000Anikait +Anikait17.00Anikait -Agrawal18.0000Agrawal +Agrawal18.00Agrawal ~~END~~ @@ -3791,16 +3791,16 @@ SELECT * FROM babel_3409_concat_ws_dep_view2 GO ~~START~~ nvarchar -abc-abc -abc-12-12.0000-2000-12-12 12:43:00 -🙂defghi-🙂defghi -🙂defghi-13-13.0000-2000-12-13 12:43:00 -🙂🙂-🙂🙂 -🙂🙂-14-14.0000-2000-12-14 12:43:00 -比尔·拉-比尔·拉 -比尔·拉-15-15.0000-2000-12-15 12:43:00 -莫斯-莫斯 -莫斯-16-16.0000-2000-12-16 12:43:00 +abc-abc -abc-12-2000-12-12 12:43:00 +🙂defghi-🙂defghi -🙂defghi-13-2000-12-13 12:43:00 +🙂🙂-🙂🙂 -🙂🙂-14-2000-12-14 12:43:00 +比尔·拉-比尔·拉 -比尔·拉-15-2000-12-15 12:43:00 +莫斯-莫斯 -莫斯-16-2000-12-16 12:43:00 -Anikait-Anikait -Anikait-17-17.0000-2000-12-17 12:43:00 +Anikait-Anikait -Anikait-17-2000-12-17 12:43:00 -Agrawal-Agrawal -Agrawal-18-18.0000-2000-12-18 12:43:00 +Agrawal-Agrawal -Agrawal-18-2000-12-18 12:43:00 ~~END~~ @@ -3808,16 +3808,16 @@ EXEC babel_3409_concat_ws_dep_proc2 GO ~~START~~ nvarchar -abc-12.0000-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 -🙂defghi-13.0000-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 -🙂🙂-14.0000-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 -比尔·拉-15.0000-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 -莫斯-16.0000-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 +abc-12.00-2000-12-12 12:43:10-2000-12-12 12:43:10-ab-2000-12-12-12:43:10-2000-12-12 12:43:10.1234 +10:00 +🙂defghi-13.00-2000-12-13 12:43:10-2000-12-13 12:43:10-cd-2000-12-13-12:43:10-2000-12-13 12:43:10.1234 +10:00 +🙂🙂-14.00-2000-12-14 12:43:10-2000-12-14 12:43:10-ef-2000-12-14-12:43:10-2000-12-14 12:43:10.1234 +10:00 +比尔·拉-15.00-2000-12-15 12:43:10-2000-12-15 12:43:10-gh-2000-12-15-12:43:10-2000-12-15 12:43:10.1234 +10:00 +莫斯-16.00-2000-12-16 12:43:10-2000-12-16 12:43:10-ip-2000-12-16-12:43:10-2000-12-16 12:43:10.1234 +10:00 -Anikait-17.0000-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 +Anikait-17.00-2000-12-17 12:43:10-2000-12-17 12:43:10-qr-2000-12-17-12:43:10-2000-12-17 12:43:10.1234 +10:00 -Agrawal-18.0000-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 +Agrawal-18.00-2000-12-18 12:43:10-2000-12-18 12:43:10-rs-2000-12-18-12:43:10-2000-12-18 12:43:10.1234 +10:00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out index 4905f8ee3d..b294351531 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-before-15_8-or-16_4-vu-verify.out @@ -491,7 +491,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -500,7 +500,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-vu-verify.out index 8e61178040..3cb02779ed 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/ltrim-vu-verify.out @@ -609,7 +609,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -618,7 +618,7 @@ SELECT LTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-before-15_8-or-16_4-vu-verify.out index 3ea3630d64..d904600523 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-before-15_8-or-16_4-vu-verify.out @@ -2622,7 +2622,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2640,7 +2640,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2649,7 +2649,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2667,7 +2667,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-vu-verify.out index 889b6a354e..928f210898 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replace-vu-verify.out @@ -2768,7 +2768,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2786,7 +2786,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2795,7 +2795,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2813,7 +2813,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-before-15_8-or-16_4-vu-verify.out index 25ed1f4268..fad0a205d8 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-before-15_8-or-16_4-vu-verify.out @@ -539,7 +539,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ @@ -548,7 +548,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-vu-verify.out index b20a4edb8a..1ea45e60c6 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/replicate-vu-verify.out @@ -657,7 +657,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ @@ -666,7 +666,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-before-15_8-or-16_4-vu-verify.out index 6dd5d91287..fd5272a337 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-before-15_8-or-16_4-vu-verify.out @@ -483,7 +483,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ @@ -492,7 +492,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-vu-verify.out index f6f6c892c8..033918ce87 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/reverse-vu-verify.out @@ -601,7 +601,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ @@ -610,7 +610,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-before-15_8-or-16_4-vu-verify.out index 312c8e6857..c7ed7922ef 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-before-15_8-or-16_4-vu-verify.out @@ -597,7 +597,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ @@ -606,7 +606,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-vu-verify.out index b49a942bcc..2943609305 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/right-vu-verify.out @@ -715,7 +715,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ @@ -724,7 +724,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out index c6a1c4d442..52dce48de1 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-before-15_8-or-16_4-vu-verify.out @@ -491,7 +491,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -500,7 +500,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-vu-verify.out index ef9a47c0ea..6938b2da4f 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/rtrim-vu-verify.out @@ -609,7 +609,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -618,7 +618,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out index ff5a9d4d64..e18b83723f 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-14_5-vu-verify.out @@ -976,10 +976,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -996,10 +996,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out index 81d9410fbc..5dec610170 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-before-15_5-or-14_10-vu-verify.out @@ -1062,10 +1062,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1074,10 +1074,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1086,10 +1086,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1098,10 +1098,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-vu-verify.out index 8ef1c1e010..b7abd65dc9 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/string_agg-vu-verify.out @@ -1163,10 +1163,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1175,10 +1175,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1187,10 +1187,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1199,10 +1199,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-before-15_8-or-16_4-vu-verify.out index 9b457d7c4d..6031055f8d 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-before-15_8-or-16_4-vu-verify.out @@ -2378,7 +2378,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString money = 12356; @@ -2402,7 +2402,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ @@ -2411,7 +2411,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString smallmoney = 12356; @@ -2435,7 +2435,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-vu-verify.out index 4de83380e7..e7535ac31b 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/stuff-vu-verify.out @@ -2521,7 +2521,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString money = 12356; @@ -2545,7 +2545,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ @@ -2554,7 +2554,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString smallmoney = 12356; @@ -2578,7 +2578,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-before-15_11-or-16_7-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-before-15_11-or-16_7-vu-verify.out index eadb0de6a9..b5cebd7d85 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-before-15_11-or-16_7-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-before-15_11-or-16_7-vu-verify.out @@ -1621,7 +1621,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -1639,7 +1639,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-vu-verify.out index 0f09f809c8..ee39ba6441 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/trim-vu-verify.out @@ -1644,7 +1644,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -1662,7 +1662,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out index 90af36cef7..090bb07d76 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-before-15_8-or-16_4-vu-verify.out @@ -472,12 +472,12 @@ SELECT LOWER(@money) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ @@ -487,12 +487,12 @@ SELECT LOWER(@smallmoney) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-vu-verify.out index fcf09325fb..cc0115b584 100644 --- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-vu-verify.out +++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/upper_lower-vu-verify.out @@ -472,12 +472,12 @@ SELECT LOWER(@money) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ @@ -487,12 +487,12 @@ SELECT LOWER(@smallmoney) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ diff --git a/test/JDBC/expected/replace-before-14_3-vu-verify.out b/test/JDBC/expected/replace-before-14_3-vu-verify.out index 926c5dc37c..7c70103ea8 100644 --- a/test/JDBC/expected/replace-before-14_3-vu-verify.out +++ b/test/JDBC/expected/replace-before-14_3-vu-verify.out @@ -2624,7 +2624,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2642,7 +2642,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2651,7 +2651,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2669,7 +2669,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/replace-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/replace-before-15_8-or-16_4-vu-verify.out index f55cadceb2..105150590e 100644 --- a/test/JDBC/expected/replace-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/replace-before-15_8-or-16_4-vu-verify.out @@ -2622,7 +2622,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2640,7 +2640,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2649,7 +2649,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2667,7 +2667,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/replace-vu-verify.out b/test/JDBC/expected/replace-vu-verify.out index 7421fb0b30..5e6d58257f 100644 --- a/test/JDBC/expected/replace-vu-verify.out +++ b/test/JDBC/expected/replace-vu-verify.out @@ -2768,7 +2768,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2786,7 +2786,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ @@ -2795,7 +2795,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -2813,7 +2813,7 @@ SELECT replace(@inputString, @pattern, @replacement) GO ~~START~~ varchar -12.0000 +12.00 ~~END~~ diff --git a/test/JDBC/expected/replicate-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/replicate-before-15_8-or-16_4-vu-verify.out index 394d6575f2..90b66c543c 100644 --- a/test/JDBC/expected/replicate-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/replicate-before-15_8-or-16_4-vu-verify.out @@ -539,7 +539,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ @@ -548,7 +548,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ diff --git a/test/JDBC/expected/replicate-vu-verify.out b/test/JDBC/expected/replicate-vu-verify.out index 7b86186651..5c94a87191 100644 --- a/test/JDBC/expected/replicate-vu-verify.out +++ b/test/JDBC/expected/replicate-vu-verify.out @@ -657,7 +657,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ @@ -666,7 +666,7 @@ SELECT replicate(@inputString, 4) GO ~~START~~ varchar -12356.000012356.000012356.000012356.0000 +12356.0012356.0012356.0012356.00 ~~END~~ diff --git a/test/JDBC/expected/reverse-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/reverse-before-15_8-or-16_4-vu-verify.out index a863f3368d..951968895b 100644 --- a/test/JDBC/expected/reverse-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/reverse-before-15_8-or-16_4-vu-verify.out @@ -483,7 +483,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ @@ -492,7 +492,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ diff --git a/test/JDBC/expected/reverse-vu-verify.out b/test/JDBC/expected/reverse-vu-verify.out index beed674d8c..9e458b43d8 100644 --- a/test/JDBC/expected/reverse-vu-verify.out +++ b/test/JDBC/expected/reverse-vu-verify.out @@ -601,7 +601,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ @@ -610,7 +610,7 @@ SELECT reverse(@inputString) GO ~~START~~ varchar -0000.65321 +00.65321 ~~END~~ diff --git a/test/JDBC/expected/right-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/right-before-15_8-or-16_4-vu-verify.out index 183c657aeb..bda1681d9b 100644 --- a/test/JDBC/expected/right-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/right-before-15_8-or-16_4-vu-verify.out @@ -597,7 +597,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ @@ -606,7 +606,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ diff --git a/test/JDBC/expected/right-vu-verify.out b/test/JDBC/expected/right-vu-verify.out index 5606efdc9c..d774565c96 100644 --- a/test/JDBC/expected/right-vu-verify.out +++ b/test/JDBC/expected/right-vu-verify.out @@ -715,7 +715,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ @@ -724,7 +724,7 @@ SELECT RIGHT(@inputString, 3) GO ~~START~~ varchar -000 +.00 ~~END~~ diff --git a/test/JDBC/expected/rtrim-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/rtrim-before-15_8-or-16_4-vu-verify.out index 0941a5d4df..e5a1de6d42 100644 --- a/test/JDBC/expected/rtrim-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/rtrim-before-15_8-or-16_4-vu-verify.out @@ -491,7 +491,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -500,7 +500,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/rtrim-vu-verify.out b/test/JDBC/expected/rtrim-vu-verify.out index 757c6bcb27..e866f548c5 100644 --- a/test/JDBC/expected/rtrim-vu-verify.out +++ b/test/JDBC/expected/rtrim-vu-verify.out @@ -609,7 +609,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -618,7 +618,7 @@ SELECT RTRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/string_agg-before-14_5-vu-verify.out b/test/JDBC/expected/string_agg-before-14_5-vu-verify.out index f39c173bf2..58d69493aa 100644 --- a/test/JDBC/expected/string_agg-before-14_5-vu-verify.out +++ b/test/JDBC/expected/string_agg-before-14_5-vu-verify.out @@ -1064,10 +1064,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1076,10 +1076,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1088,10 +1088,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1100,10 +1100,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/string_agg-before-15_5-or-14_10-vu-verify.out b/test/JDBC/expected/string_agg-before-15_5-or-14_10-vu-verify.out index d860faf978..7f020e9f7b 100644 --- a/test/JDBC/expected/string_agg-before-15_5-or-14_10-vu-verify.out +++ b/test/JDBC/expected/string_agg-before-15_5-or-14_10-vu-verify.out @@ -1064,10 +1064,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1076,10 +1076,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1088,10 +1088,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1100,10 +1100,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/string_agg-before-15_9-or-16_5-vu-verify.out b/test/JDBC/expected/string_agg-before-15_9-or-16_5-vu-verify.out index 3beb742f77..81834fb6ab 100644 --- a/test/JDBC/expected/string_agg-before-15_9-or-16_5-vu-verify.out +++ b/test/JDBC/expected/string_agg-before-15_9-or-16_5-vu-verify.out @@ -1064,10 +1064,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1076,10 +1076,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1088,10 +1088,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1100,10 +1100,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/string_agg-vu-verify.out b/test/JDBC/expected/string_agg-vu-verify.out index f3f94aec88..0ffa1122a1 100644 --- a/test/JDBC/expected/string_agg-vu-verify.out +++ b/test/JDBC/expected/string_agg-vu-verify.out @@ -1163,10 +1163,10 @@ SELECT STRING_AGG(col_money, '-') FROM babel_5156_string_agg_t1 GROUP BY group_i GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1175,10 +1175,10 @@ SELECT STRING_AGG(col_money, @sep) FROM babel_5156_string_agg_t1 GROUP BY group_ GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ @@ -1187,10 +1187,10 @@ SELECT STRING_AGG(col_smallmoney, '-') FROM babel_5156_string_agg_t1 GROUP BY gr GO ~~START~~ nvarchar -12.0000-13.0000-14.0000 -15.0000-16.0000 +12.00-13.00-14.00 +15.00-16.00 -17.0000-18.0000 +17.00-18.00 ~~END~~ @@ -1199,10 +1199,10 @@ SELECT STRING_AGG(col_smallmoney, @sep) FROM babel_5156_string_agg_t1 GROUP BY g GO ~~START~~ nvarchar -12.00000.000013.00000.000014.0000 -15.00000.000016.0000 +12.000.0013.000.0014.00 +15.000.0016.00 -17.00000.000018.0000 +17.000.0018.00 ~~END~~ diff --git a/test/JDBC/expected/stuff-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/stuff-before-15_8-or-16_4-vu-verify.out index 7aa92ca4e8..eba1c5e709 100644 --- a/test/JDBC/expected/stuff-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/stuff-before-15_8-or-16_4-vu-verify.out @@ -2378,7 +2378,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString money = 12356; @@ -2402,7 +2402,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ @@ -2411,7 +2411,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString smallmoney = 12356; @@ -2435,7 +2435,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ diff --git a/test/JDBC/expected/stuff-vu-verify.out b/test/JDBC/expected/stuff-vu-verify.out index 4364f45ec7..0a38352dc2 100644 --- a/test/JDBC/expected/stuff-vu-verify.out +++ b/test/JDBC/expected/stuff-vu-verify.out @@ -2505,7 +2505,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString money = 12356; @@ -2529,7 +2529,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ @@ -2538,7 +2538,7 @@ SELECT stuff(@inputString, 4, 1, 'abcd') GO ~~START~~ varchar -123abcd6.0000 +123abcd6.00 ~~END~~ DECLARE @inputString smallmoney = 12356; @@ -2562,7 +2562,7 @@ SELECT stuff('abcd', 4, 1, @inputString) GO ~~START~~ varchar -abc12356.0000 +abc12356.00 ~~END~~ diff --git a/test/JDBC/expected/test_conv_money_to_varchar-vu-prepare.out b/test/JDBC/expected/test_conv_money_to_varchar-vu-prepare.out index 559ceae53b..d2f861af18 100644 --- a/test/JDBC/expected/test_conv_money_to_varchar-vu-prepare.out +++ b/test/JDBC/expected/test_conv_money_to_varchar-vu-prepare.out @@ -12,17 +12,25 @@ CREATE VIEW test_conv_string_to_date_v1 as ( val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2) - FROM test_conv_money_to_varchar_t1 + FROM test_conv_money_to_varchar_t1 ORDER BY val ); GO CREATE PROCEDURE test_conv_string_to_date_p1 as ( SELECT val, + val_cast_varchar = '$' + CAST(val AS VARCHAR), + val_cast_varchar25 = '$' + CAST(val AS VARCHAR(25)), + val_cast_nvarchar = '$' + CAST(val AS NVARCHAR), + val_cast_nvarchar25 = '$' + CAST(val AS NVARCHAR(25)), + val_cast_char = '$' + CAST(val AS CHAR), + val_cast_char25 = '$' + CAST(val AS CHAR(25)), + val_cast_nchar = '$' + CAST(val AS NCHAR), + val_cast_nchar25 = '$' + CAST(val AS NCHAR(25)), val_convert = '$' + CONVERT(VARCHAR, val) , val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2) - FROM test_conv_money_to_varchar_t1 + FROM test_conv_money_to_varchar_t1 ORDER BY val ); GO @@ -30,10 +38,18 @@ CREATE FUNCTION test_conv_string_to_date_f1() RETURNS TABLE AS RETURN ( SELECT val, + val_cast_varchar = '$' + CAST(val AS VARCHAR), + val_cast_varchar25 = '$' + CAST(val AS VARCHAR(25)), + val_cast_nvarchar = '$' + CAST(val AS NVARCHAR), + val_cast_nvarchar25 = '$' + CAST(val AS NVARCHAR(25)), + val_cast_char = '$' + CAST(val AS CHAR), + val_cast_char25 = '$' + CAST(val AS CHAR(25)), + val_cast_nchar = '$' + CAST(val AS NCHAR), + val_cast_nchar25 = '$' + CAST(val AS NCHAR(25)), val_convert = '$' + CONVERT(VARCHAR, val) , val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2) - FROM test_conv_money_to_varchar_t1 + FROM test_conv_money_to_varchar_t1 ORDER BY val ); GO diff --git a/test/JDBC/expected/test_conv_money_to_varchar-vu-verify.out b/test/JDBC/expected/test_conv_money_to_varchar-vu-verify.out index ba99be29c3..d7f3dd8221 100644 --- a/test/JDBC/expected/test_conv_money_to_varchar-vu-verify.out +++ b/test/JDBC/expected/test_conv_money_to_varchar-vu-verify.out @@ -1,6 +1,7 @@ -- Conversion of money to varchar DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -8,13 +9,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(VARCHAR, @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 ~~END~~ DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -22,13 +24,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(VARCHAR, @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 ~~END~~ DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -36,13 +39,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(VARCHAR, @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 ~~END~~ DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -50,13 +54,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(VARCHAR, @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 ~~END~~ DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -64,48 +69,51 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(VARCHAR, @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -123456789123456.1246#!#$123456789123456.12#!#$123456789123456.12#!#$123,456,789,123,456.12#!#$123456789123456.1246#!#$123456789123456.1246 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +123456789123456.1246#!#$123456789123456.12#!#$123456789123456.12#!#$123456789123456.12#!#$123,456,789,123,456.12#!#$123456789123456.1246#!#$123456789123456.1246 ~~END~~ SELECT val, + val_cast = '$' + CAST(val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, val), val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2), val_convert_style_126 = '$' + CONVERT(VARCHAR, val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 ~~END~~ SELECT val, + val_cast = '$' + CAST(val AS VARCHAR(10)), val_convert = '$' + CONVERT(VARCHAR(10), val), val_convert_style_0 = '$' + CONVERT(VARCHAR(10), val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR(10), val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR(10), val, 2), val_convert_style_126 = '$' + CONVERT(VARCHAR(10), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 ~~END~~ -- Conversion of money to char DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -113,13 +121,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(CHAR(25), @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +1234.0000#!#$ 1234.00#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 ~~END~~ DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -127,13 +136,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(CHAR(25), @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -0.0000#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +0.0000#!#$ 0.00#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 ~~END~~ DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -141,13 +151,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(CHAR(25), @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -123.1200#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +123.1200#!#$ 123.12#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 ~~END~~ DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -155,13 +166,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(CHAR(25), @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -0.1246#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +0.1246#!#$ 0.12#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 ~~END~~ DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -169,31 +181,33 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(CHAR(25), @val, 126); GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -123456789123456.1246#!#$123456789123456.12 #!#$123456789123456.12 #!#$123,456,789,123,456.12 #!#$123456789123456.1246 #!#$123456789123456.1246 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +123456789123456.1246#!#$ 123456789123456.12#!#$123456789123456.12 #!#$123456789123456.12 #!#$123,456,789,123,456.12 #!#$123456789123456.1246 #!#$123456789123456.1246 ~~END~~ SELECT val, + val_cast = '$' + CAST(val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), val), val_convert_style_0 = '$' + CONVERT(CHAR(25), val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), val, 1), val_convert_style_2 = '$' + CONVERT(CHAR(25), val, 2), val_convert_style_126 = '$' + CONVERT(CHAR(25), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 -0.0000#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 -123.1200#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 -0.1246#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 +money#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar +0.0000#!#$ 0.00#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 +0.1246#!#$ 0.12#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 +123.1200#!#$ 123.12#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 +1234.0000#!#$ 1234.00#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 ~~END~~ -- Conversion of money to nvarchar DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -201,13 +215,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NVARCHAR, @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 ~~END~~ DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -215,13 +230,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NVARCHAR, @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 ~~END~~ DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -229,13 +245,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NVARCHAR, @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 ~~END~~ DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -243,13 +260,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NVARCHAR, @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 ~~END~~ DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -257,48 +275,51 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NVARCHAR, @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -123456789123456.1246#!#$123456789123456.12#!#$123456789123456.12#!#$123,456,789,123,456.12#!#$123456789123456.1246#!#$123456789123456.1246 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +123456789123456.1246#!#$123456789123456.12#!#$123456789123456.12#!#$123456789123456.12#!#$123,456,789,123,456.12#!#$123456789123456.1246#!#$123456789123456.1246 ~~END~~ SELECT val, + val_cast = '$' + CAST(val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(NVARCHAR, val, 2), val_convert_style_126 = '$' + CONVERT(NVARCHAR, val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 ~~END~~ SELECT val, + val_cast = '$' + CAST(val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR(10), val), val_convert_style_0 = '$' + CONVERT(NVARCHAR(10), val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR(10), val, 1), val_convert_style_2 = '$' + CONVERT(NVARCHAR(10), val, 2), val_convert_style_126 = '$' + CONVERT(NVARCHAR(10), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000#!#$0.0000 +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246#!#$0.1246 +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200#!#$123.1200 +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000#!#$1234.0000 ~~END~~ -- Conversion of money to nchar DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -306,13 +327,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NCHAR(25), @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -1234.0000#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +1234.0000#!#$ 1234.00#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 ~~END~~ DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -320,13 +342,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NCHAR(25), @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -0.0000#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +0.0000#!#$ 0.00#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 ~~END~~ DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -334,13 +357,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NCHAR(25), @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -123.1200#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +123.1200#!#$ 123.12#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 ~~END~~ DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -348,13 +372,14 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NCHAR(25), @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -0.1246#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +0.1246#!#$ 0.12#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 ~~END~~ DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -362,58 +387,68 @@ SELECT @val, val_convert_style_126 = '$' + CONVERT(NCHAR(25), @val, 126); GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -123456789123456.1246#!#$123456789123456.12 #!#$123456789123456.12 #!#$123,456,789,123,456.12 #!#$123456789123456.1246 #!#$123456789123456.1246 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +123456789123456.1246#!#$ 123456789123456.12#!#$123456789123456.12 #!#$123456789123456.12 #!#$123,456,789,123,456.12 #!#$123456789123456.1246 #!#$123456789123456.1246 ~~END~~ SELECT val, + val_cast = '$' + CAST(val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), val, 1), val_convert_style_2 = '$' + CONVERT(NCHAR(25), val, 2), val_convert_style_126 = '$' + CONVERT(NCHAR(25), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO ~~START~~ -money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar -1234.0000#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 -0.0000#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 -123.1200#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 -0.1246#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 +money#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar#!#nvarchar +0.0000#!#$ 0.00#!#$0.00 #!#$0.00 #!#$0.00 #!#$0.0000 #!#$0.0000 +0.1246#!#$ 0.12#!#$0.12 #!#$0.12 #!#$0.12 #!#$0.1246 #!#$0.1246 +123.1200#!#$ 123.12#!#$123.12 #!#$123.12 #!#$123.12 #!#$123.1200 #!#$123.1200 +1234.0000#!#$ 1234.00#!#$1234.00 #!#$1234.00 #!#$1,234.00 #!#$1234.0000 #!#$1234.0000 ~~END~~ +-- Should throw error since resultant money value is larger than specified typmod +DECLARE @val MONEY = 1234.5678 +SELECT @val, val_cast = '$' + CAST(@val AS CHAR(5)); +GO +~~ERROR (Code: 33557097)~~ + +~~ERROR (Message: There is insufficient result space to convert a money/smallmoney value to varchar/nvarchar.)~~ + + -- Dependent objects SELECT * FROM test_conv_string_to_date_v1 GO ~~START~~ money#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000 0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000 -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200 0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246 +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200 +1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000 ~~END~~ EXEC test_conv_string_to_date_p1 GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000 -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000 -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200 -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246 +money#!#varchar#!#varchar#!#nvarchar#!#nvarchar#!#varchar#!#varchar#!#nvarchar#!#nvarchar#!#varchar#!#varchar#!#varchar#!#varchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$ 0.00#!#$ 0.00#!#$ 0.00#!#$ 0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000 +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$ 0.12#!#$ 0.12#!#$ 0.12#!#$ 0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246 +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$ 123.12#!#$ 123.12#!#$ 123.12#!#$ 123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200 +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1234.00#!#$ 1234.00#!#$ 1234.00#!#$ 1234.00#!#$ 1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000 ~~END~~ SELECT * FROM test_conv_string_to_date_f1() GO ~~START~~ -money#!#varchar#!#varchar#!#varchar#!#varchar -1234.0000#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000 -0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.0000 -123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.1200 -0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.1246 +money#!#varchar#!#varchar#!#nvarchar#!#nvarchar#!#varchar#!#varchar#!#nvarchar#!#nvarchar#!#varchar#!#varchar#!#varchar#!#varchar +0.0000#!#$0.00#!#$0.00#!#$0.00#!#$0.00#!#$ 0.00#!#$ 0.00#!#$ 0.00#!#$ 0.00#!#$0.00#!#$0.00#!#$0.00#!#$0.0000 +0.1246#!#$0.12#!#$0.12#!#$0.12#!#$0.12#!#$ 0.12#!#$ 0.12#!#$ 0.12#!#$ 0.12#!#$0.12#!#$0.12#!#$0.12#!#$0.1246 +123.1200#!#$123.12#!#$123.12#!#$123.12#!#$123.12#!#$ 123.12#!#$ 123.12#!#$ 123.12#!#$ 123.12#!#$123.12#!#$123.12#!#$123.12#!#$123.1200 +1234.0000#!#$1234.00#!#$1234.00#!#$1234.00#!#$1234.00#!#$ 1234.00#!#$ 1234.00#!#$ 1234.00#!#$ 1234.00#!#$1234.00#!#$1234.00#!#$1,234.00#!#$1234.0000 ~~END~~ diff --git a/test/JDBC/expected/trim-before-15_11-or-16_7-vu-verify.out b/test/JDBC/expected/trim-before-15_11-or-16_7-vu-verify.out index 4897fd9f90..37e6c17f2b 100644 --- a/test/JDBC/expected/trim-before-15_11-or-16_7-vu-verify.out +++ b/test/JDBC/expected/trim-before-15_11-or-16_7-vu-verify.out @@ -1621,7 +1621,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -1639,7 +1639,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/trim-vu-verify.out b/test/JDBC/expected/trim-vu-verify.out index 90799370c5..4f72f2c272 100644 --- a/test/JDBC/expected/trim-vu-verify.out +++ b/test/JDBC/expected/trim-vu-verify.out @@ -1644,7 +1644,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ @@ -1662,7 +1662,7 @@ SELECT TRIM(@inputString) GO ~~START~~ varchar -12356.0000 +12356.00 ~~END~~ diff --git a/test/JDBC/expected/upper_lower-before-15_8-or-16_4-vu-verify.out b/test/JDBC/expected/upper_lower-before-15_8-or-16_4-vu-verify.out index d59935603c..73ba9d620d 100644 --- a/test/JDBC/expected/upper_lower-before-15_8-or-16_4-vu-verify.out +++ b/test/JDBC/expected/upper_lower-before-15_8-or-16_4-vu-verify.out @@ -472,12 +472,12 @@ SELECT LOWER(@money) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ @@ -487,12 +487,12 @@ SELECT LOWER(@smallmoney) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ diff --git a/test/JDBC/expected/upper_lower-vu-verify.out b/test/JDBC/expected/upper_lower-vu-verify.out index 1c84d51c56..b1d2d2b6b6 100644 --- a/test/JDBC/expected/upper_lower-vu-verify.out +++ b/test/JDBC/expected/upper_lower-vu-verify.out @@ -472,12 +472,12 @@ SELECT LOWER(@money) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ @@ -487,12 +487,12 @@ SELECT LOWER(@smallmoney) GO ~~START~~ varchar -2.0000 +2.00 ~~END~~ ~~START~~ varchar -2.0000 +2.00 ~~END~~ diff --git a/test/JDBC/input/functions/string_functions/concat-vu-prepare.mix b/test/JDBC/input/functions/string_functions/concat-vu-prepare.mix index ff632806fb..9047d6e3a3 100644 --- a/test/JDBC/input/functions/string_functions/concat-vu-prepare.mix +++ b/test/JDBC/input/functions/string_functions/concat-vu-prepare.mix @@ -462,7 +462,7 @@ RETURN (SELECT TOP 1 CONCAT(col_nvarchar, col_nchar, col_int, col_bigint, col_sm GO CREATE VIEW babel_3409_concat_dep_view2 AS - SELECT CONCAT(col_nvarchar, col_nchar, col_varchar, col_decimal, col_smallmoney, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_t1 + SELECT CONCAT(col_nvarchar, col_nchar, col_varchar, col_decimal, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_t1 GO CREATE PROCEDURE babel_3409_concat_dep_proc2 AS diff --git a/test/JDBC/input/functions/string_functions/concat_ws-vu-prepare.mix b/test/JDBC/input/functions/string_functions/concat_ws-vu-prepare.mix index a4edaf34b4..eef7ce9b56 100644 --- a/test/JDBC/input/functions/string_functions/concat_ws-vu-prepare.mix +++ b/test/JDBC/input/functions/string_functions/concat_ws-vu-prepare.mix @@ -462,7 +462,7 @@ RETURN (SELECT TOP 1 CONCAT_WS('-', col_nvarchar, col_nchar, col_int, col_bigint GO CREATE VIEW babel_3409_concat_ws_dep_view2 AS - SELECT CONCAT_WS(N'-', col_nvarchar, col_nchar, col_varchar, col_decimal, col_smallmoney, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_ws_t1 + SELECT CONCAT_WS(N'-', col_nvarchar, col_nchar, col_varchar, col_decimal, col_smalldatetime) AS concatenated_column FROM babel_3409_concat_ws_t1 GO CREATE PROCEDURE babel_3409_concat_ws_dep_proc2 AS diff --git a/test/JDBC/input/functions/test_conv_money_to_varchar-vu-prepare.sql b/test/JDBC/input/functions/test_conv_money_to_varchar-vu-prepare.sql index 9cbe407788..69ca53037b 100644 --- a/test/JDBC/input/functions/test_conv_money_to_varchar-vu-prepare.sql +++ b/test/JDBC/input/functions/test_conv_money_to_varchar-vu-prepare.sql @@ -10,17 +10,25 @@ CREATE VIEW test_conv_string_to_date_v1 as ( val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2) - FROM test_conv_money_to_varchar_t1 + FROM test_conv_money_to_varchar_t1 ORDER BY val ); GO CREATE PROCEDURE test_conv_string_to_date_p1 as ( SELECT val, + val_cast_varchar = '$' + CAST(val AS VARCHAR), + val_cast_varchar25 = '$' + CAST(val AS VARCHAR(25)), + val_cast_nvarchar = '$' + CAST(val AS NVARCHAR), + val_cast_nvarchar25 = '$' + CAST(val AS NVARCHAR(25)), + val_cast_char = '$' + CAST(val AS CHAR), + val_cast_char25 = '$' + CAST(val AS CHAR(25)), + val_cast_nchar = '$' + CAST(val AS NCHAR), + val_cast_nchar25 = '$' + CAST(val AS NCHAR(25)), val_convert = '$' + CONVERT(VARCHAR, val) , val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2) - FROM test_conv_money_to_varchar_t1 + FROM test_conv_money_to_varchar_t1 ORDER BY val ); GO @@ -28,10 +36,18 @@ CREATE FUNCTION test_conv_string_to_date_f1() RETURNS TABLE AS RETURN ( SELECT val, + val_cast_varchar = '$' + CAST(val AS VARCHAR), + val_cast_varchar25 = '$' + CAST(val AS VARCHAR(25)), + val_cast_nvarchar = '$' + CAST(val AS NVARCHAR), + val_cast_nvarchar25 = '$' + CAST(val AS NVARCHAR(25)), + val_cast_char = '$' + CAST(val AS CHAR), + val_cast_char25 = '$' + CAST(val AS CHAR(25)), + val_cast_nchar = '$' + CAST(val AS NCHAR), + val_cast_nchar25 = '$' + CAST(val AS NCHAR(25)), val_convert = '$' + CONVERT(VARCHAR, val) , val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2) - FROM test_conv_money_to_varchar_t1 + FROM test_conv_money_to_varchar_t1 ORDER BY val ); GO diff --git a/test/JDBC/input/functions/test_conv_money_to_varchar-vu-verify.sql b/test/JDBC/input/functions/test_conv_money_to_varchar-vu-verify.sql index 6c55387e03..d7c49ef15c 100644 --- a/test/JDBC/input/functions/test_conv_money_to_varchar-vu-verify.sql +++ b/test/JDBC/input/functions/test_conv_money_to_varchar-vu-verify.sql @@ -1,6 +1,7 @@ -- Conversion of money to varchar DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -10,6 +11,7 @@ GO DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -19,6 +21,7 @@ GO DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -28,6 +31,7 @@ GO DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -37,6 +41,7 @@ GO DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, @val), val_convert_style_0 = '$' + CONVERT(VARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, @val, 1), @@ -45,26 +50,29 @@ SELECT @val, GO SELECT val, + val_cast = '$' + CAST(val AS VARCHAR), val_convert = '$' + CONVERT(VARCHAR, val), val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2), val_convert_style_126 = '$' + CONVERT(VARCHAR, val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO SELECT val, + val_cast = '$' + CAST(val AS VARCHAR(10)), val_convert = '$' + CONVERT(VARCHAR(10), val), val_convert_style_0 = '$' + CONVERT(VARCHAR(10), val, 0), val_convert_style_1 = '$' + CONVERT(VARCHAR(10), val, 1), val_convert_style_2 = '$' + CONVERT(VARCHAR(10), val, 2), val_convert_style_126 = '$' + CONVERT(VARCHAR(10), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO -- Conversion of money to char DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -74,6 +82,7 @@ GO DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -83,6 +92,7 @@ GO DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -92,6 +102,7 @@ GO DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -101,6 +112,7 @@ GO DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), @val), val_convert_style_0 = '$' + CONVERT(CHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), @val, 1), @@ -109,17 +121,19 @@ SELECT @val, GO SELECT val, + val_cast = '$' + CAST(val AS CHAR(25)), val_convert = '$' + CONVERT(CHAR(25), val), val_convert_style_0 = '$' + CONVERT(CHAR(25), val, 0), val_convert_style_1 = '$' + CONVERT(CHAR(25), val, 1), val_convert_style_2 = '$' + CONVERT(CHAR(25), val, 2), val_convert_style_126 = '$' + CONVERT(CHAR(25), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO -- Conversion of money to nvarchar DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -129,6 +143,7 @@ GO DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -138,6 +153,7 @@ GO DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -147,6 +163,7 @@ GO DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -156,6 +173,7 @@ GO DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, @val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, @val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, @val, 1), @@ -164,26 +182,29 @@ SELECT @val, GO SELECT val, + val_cast = '$' + CAST(val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR, val), val_convert_style_0 = '$' + CONVERT(NVARCHAR, val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR, val, 1), val_convert_style_2 = '$' + CONVERT(NVARCHAR, val, 2), val_convert_style_126 = '$' + CONVERT(NVARCHAR, val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO SELECT val, + val_cast = '$' + CAST(val AS NVARCHAR), val_convert = '$' + CONVERT(NVARCHAR(10), val), val_convert_style_0 = '$' + CONVERT(NVARCHAR(10), val, 0), val_convert_style_1 = '$' + CONVERT(NVARCHAR(10), val, 1), val_convert_style_2 = '$' + CONVERT(NVARCHAR(10), val, 2), val_convert_style_126 = '$' + CONVERT(NVARCHAR(10), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val GO -- Conversion of money to nchar DECLARE @val MONEY = 1234 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -193,6 +214,7 @@ GO DECLARE @val MONEY = 0 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -202,6 +224,7 @@ GO DECLARE @val MONEY = 123.12 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -211,6 +234,7 @@ GO DECLARE @val MONEY = 0.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -220,6 +244,7 @@ GO DECLARE @val MONEY = 123456789123456.12456 SELECT @val, + val_cast = '$' + CAST(@val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), @val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), @val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), @val, 1), @@ -228,12 +253,18 @@ SELECT @val, GO SELECT val, + val_cast = '$' + CAST(val AS NCHAR(25)), val_convert = '$' + CONVERT(NCHAR(25), val), val_convert_style_0 = '$' + CONVERT(NCHAR(25), val, 0), val_convert_style_1 = '$' + CONVERT(NCHAR(25), val, 1), val_convert_style_2 = '$' + CONVERT(NCHAR(25), val, 2), val_convert_style_126 = '$' + CONVERT(NCHAR(25), val, 126) -FROM test_conv_money_to_varchar_t1 +FROM test_conv_money_to_varchar_t1 ORDER BY val +GO + +-- Should throw error since resultant money value is larger than specified typmod +DECLARE @val MONEY = 1234.5678 +SELECT @val, val_cast = '$' + CAST(@val AS CHAR(5)); GO -- Dependent objects diff --git a/test/python/expected/upgrade_validation/expected_dependency.out b/test/python/expected/upgrade_validation/expected_dependency.out index f0769546b5..7c066406f2 100644 --- a/test/python/expected/upgrade_validation/expected_dependency.out +++ b/test/python/expected/upgrade_validation/expected_dependency.out @@ -405,6 +405,8 @@ Function sys.exp(double precision) Function sys.exp(numeric) Function sys.fetch_status() Function sys.fixeddecimal(sys.fixeddecimal,integer) +Function sys.fixeddecimal2bpchar(sys.fixeddecimal,integer,boolean) +Function sys.fixeddecimal2varchar(sys.fixeddecimal,integer,boolean) Function sys.fixeddecimal_avg(internal) Function sys.fixeddecimal_avg_accum(internal,sys.fixeddecimal) Function sys.fixeddecimal_cmp(sys.fixeddecimal,sys.fixeddecimal)