From 0b89174ecb0cb5276832b8cee5c36abcdd7e309d Mon Sep 17 00:00:00 2001 From: hvlad Date: Fri, 7 Nov 2008 09:29:34 +0000 Subject: [PATCH] Temporary fix for CORE-2140 : Error messages after parameters substitution contains '\n' characters instead of line break Using hardcoded (in messages2.sql) line breaks seems to me to be not fully correct as it depends on host OS where file was last edited. --- src/msgs/facilities2.sql | 2 +- src/msgs/history2.sql | 2 ++ src/msgs/messages2.sql | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/msgs/facilities2.sql b/src/msgs/facilities2.sql index fb1d36a275..fcb6519a9d 100644 --- a/src/msgs/facilities2.sql +++ b/src/msgs/facilities2.sql @@ -1,7 +1,7 @@ /* MAX_NUMBER is the next number to be used, always one more than the highest message number. */ set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?); -- -('2008-09-28 08:41:09', 'JRD', 0, 650) +('2008-11-07 10:55:00', 'JRD', 0, 650) ('2005-09-02 00:55:59', 'QLI', 1, 513) ('1996-11-07 13:38:37', 'GDEF', 2, 345) ('2007-04-07 13:11:00', 'GFIX', 3, 116) diff --git a/src/msgs/history2.sql b/src/msgs/history2.sql index e3a5489a0d..6cb7c4c5fa 100644 --- a/src/msgs/history2.sql +++ b/src/msgs/history2.sql @@ -1197,6 +1197,8 @@ Fetches = !f', NULL, NULL, 'c_pg'); (1192, 'cvc', '2008-07-06 06:06:47', 0, 13, 'internal gds software consistency check (@1)', NULL, NULL, 'c_pg') (1193, 'cvc', '2008-07-06 08:47:00', 0, 227, 'internal gds software consistency check (invalid RDB$CONSTRAINT_TYPE)', NULL, NULL, 'c_pg') (1194, 'cvc', '2008-07-06 08:47:21', 13, 704, 'internal gds software consistency check (invalid RDB$CONSTRAINT_TYPE)', NULL, NULL, 'c_pg') +(1195, 'hvlad', '2008-11-07 10:55:00', 0, 601, 'Execute statement error at @1 :\n@2Data source : @3', NULL, NULL, 'c_pg') +(1196, 'hvlad', '2008-11-07 10:55:00', 0, 606, 'Execute statement error at @1 :\n@2Statement : @3\nData source : @4', NULL, NULL, 'c_pg') stop COMMIT WORK; diff --git a/src/msgs/messages2.sql b/src/msgs/messages2.sql index 32c96a23cd..748d3c85db 100644 --- a/src/msgs/messages2.sql +++ b/src/msgs/messages2.sql @@ -700,12 +700,15 @@ COMMIT WORK; ('att_handle_busy', NULL, NULL, NULL, 0, 598, NULL, 'Attachment handle is busy', NULL, NULL) ('bad_udf_freeit', NULL, NULL, NULL, 0, 599, NULL, 'Bad written UDF detected: pointer returned in FREE_IT function was not allocated by ib_util_malloc', NULL, NULL) ('eds_provider_not_found', NULL, 'ExtDS.cpp', NULL, 0, 600, NULL, 'External Data Source provider ''@1'' not found', NULL, NULL) -('eds_connection', NULL, 'ExtDS.cpp', NULL, 0, 601, NULL, 'Execute statement error at @1 :\n@2Data source : @3', NULL, NULL) +('eds_connection', NULL, 'ExtDS.cpp', NULL, 0, 601, NULL, 'Execute statement error at @1 : +@2Data source : @3', NULL, NULL) ('eds_preprocess', NULL, 'ExtDS.cpp', NULL, 0, 602, NULL, 'Execute statement preprocess SQL error', NULL, NULL) ('eds_stmt_expected', NULL, 'ExtDS.cpp', NULL, 0, 603, NULL, 'Statement expected', NULL, NULL) ('eds_prm_name_expected', NULL, 'ExtDS.cpp', NULL, 0, 604, NULL, 'Parameter name expected', NULL, NULL) ('eds_unclosed_comment', NULL, 'ExtDS.cpp', NULL, 0, 605, NULL, 'Unclosed comment found near ''@1''', NULL, NULL) -('eds_statement', NULL, 'ExtDS.cpp', NULL, 0, 606, NULL, 'Execute statement error at @1 :\n@2Statement : @3\nData source : @4', NULL, NULL) +('eds_statement', NULL, 'ExtDS.cpp', NULL, 0, 606, NULL, 'Execute statement error at @1 : +@2Statement : @3 +Data source : @4', NULL, NULL) ('eds_input_prm_mismatch', NULL, 'ExtDS.cpp', NULL, 0, 607, NULL, 'Input parameters mismatch', NULL, NULL) ('eds_output_prm_mismatch', NULL, 'ExtDS.cpp', NULL, 0, 608, NULL, 'Output parameters mismatch', NULL, NULL) ('eds_input_prm_not_set', NULL, 'ExtDS.cpp', NULL, 0, 609, NULL, 'Input parameter ''@1'' have no value set', NULL, NULL)