Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[59526] firebird/trunk
|
From: <ro...@us...> - 2014-05-03 00:27:51
|
Revision: 59526
http://sourceforge.net/p/firebird/code/59526
Author: robocop
Date: 2014-05-03 00:27:47 +0000 (Sat, 03 May 2014)
Log Message:
-----------
Replace "unknown token" by specific messages.
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/dsql/pass1.cpp
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2014-05-03 00:27:47 UTC (rev 59526)
@@ -2298,6 +2298,14 @@
PARAMETER (GDS__dsql_create_generator_failed = 336397324)
INTEGER*4 GDS__dsql_set_generator_failed
PARAMETER (GDS__dsql_set_generator_failed = 336397325)
+ INTEGER*4 GDS__dsql_wlock_simple
+ PARAMETER (GDS__dsql_wlock_simple = 336397326)
+ INTEGER*4 GDS__dsql_firstskip_rows
+ PARAMETER (GDS__dsql_firstskip_rows = 336397327)
+ INTEGER*4 GDS__dsql_wlock_aggregates
+ PARAMETER (GDS__dsql_wlock_aggregates = 336397328)
+ INTEGER*4 GDS__dsql_wlock_conflict
+ PARAMETER (GDS__dsql_wlock_conflict = 336397329)
INTEGER*4 GDS__gsec_cant_open_db
PARAMETER (GDS__gsec_cant_open_db = 336723983)
INTEGER*4 GDS__gsec_switches_error
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1156,6 +1156,10 @@
gds_dsql_alter_sequence_failed = 336397323;
gds_dsql_create_generator_failed = 336397324;
gds_dsql_set_generator_failed = 336397325;
+ gds_dsql_wlock_simple = 336397326;
+ gds_dsql_firstskip_rows = 336397327;
+ gds_dsql_wlock_aggregates = 336397328;
+ gds_dsql_wlock_conflict = 336397329;
gds_gsec_cant_open_db = 336723983;
gds_gsec_switches_error = 336723984;
gds_gsec_no_op_spec = 336723985;
Modified: firebird/trunk/src/dsql/pass1.cpp
===================================================================
--- firebird/trunk/src/dsql/pass1.cpp 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/dsql/pass1.cpp 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1816,9 +1816,7 @@
(relation->rel_flags & (REL_view | REL_external))))
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- // Token unknown
- Arg::Gds(isc_token_err) <<
- Arg::Gds(isc_random) << Arg::Str("WITH LOCK"));
+ Arg::Gds(isc_dsql_wlock_simple));
}
} // end scope block
@@ -1827,9 +1825,7 @@
if ((inputRse->dsqlFirst || inputRse->dsqlSkip) && rows)
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- // Token unknown
- Arg::Gds(isc_token_err) <<
- Arg::Gds(isc_random) << Arg::Str("ROWS"));
+ Arg::Gds(isc_dsql_firstskip_rows));
}
else if (rows)
PASS1_limit(dsqlScratch, rows->length, rows->skip, rse);
@@ -1927,9 +1923,7 @@
if (updateLock)
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- // Token unknown
- Arg::Gds(isc_token_err) <<
- Arg::Gds(isc_random) << Arg::Str("WITH LOCK"));
+ Arg::Gds(isc_dsql_wlock_aggregates));
}
parent_context = FB_NEW(*tdbb->getDefaultPool()) dsql_ctx(*tdbb->getDefaultPool());
@@ -1999,9 +1993,7 @@
if (updateLock)
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- // Token unknown
- Arg::Gds(isc_token_err) <<
- Arg::Gds(isc_random) << Arg::Str("WITH LOCK"));
+ Arg::Gds(isc_dsql_wlock_conflict) << Arg::Str("DISTINCT"));
}
++dsqlScratch->inSelectList;
@@ -2583,9 +2575,7 @@
if (updateLock)
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- // Token unknown
- Arg::Gds(isc_token_err) <<
- Arg::Gds(isc_random) << Arg::Str("WITH LOCK"));
+ Arg::Gds(isc_dsql_wlock_conflict) << Arg::Str("UNION"));
}
unionRse->dsqlDistinct = union_items;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/include/gen/codetext.h 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1145,6 +1145,10 @@
{"dsql_alter_sequence_failed", 336397323},
{"dsql_create_generator_failed", 336397324},
{"dsql_set_generator_failed", 336397325},
+ {"dsql_wlock_simple", 336397326},
+ {"dsql_firstskip_rows", 336397327},
+ {"dsql_wlock_aggregates", 336397328},
+ {"dsql_wlock_conflict", 336397329},
{"gsec_cant_open_db", 336723983},
{"gsec_switches_error", 336723984},
{"gsec_no_op_spec", 336723985},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/include/gen/iberror.h 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1179,6 +1179,10 @@
const ISC_STATUS isc_dsql_alter_sequence_failed = 336397323L;
const ISC_STATUS isc_dsql_create_generator_failed = 336397324L;
const ISC_STATUS isc_dsql_set_generator_failed = 336397325L;
+const ISC_STATUS isc_dsql_wlock_simple = 336397326L;
+const ISC_STATUS isc_dsql_firstskip_rows = 336397327L;
+const ISC_STATUS isc_dsql_wlock_aggregates = 336397328L;
+const ISC_STATUS isc_dsql_wlock_conflict = 336397329L;
const ISC_STATUS isc_gsec_cant_open_db = 336723983L;
const ISC_STATUS isc_gsec_switches_error = 336723984L;
const ISC_STATUS isc_gsec_no_op_spec = 336723985L;
@@ -1280,7 +1284,7 @@
const ISC_STATUS isc_trace_switch_param_miss = 337182758L;
const ISC_STATUS isc_trace_param_act_notcompat = 337182759L;
const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L;
-const ISC_STATUS isc_err_max = 1224;
+const ISC_STATUS isc_err_max = 1228;
#else /* c definitions */
@@ -2429,6 +2433,10 @@
#define isc_dsql_alter_sequence_failed 336397323L
#define isc_dsql_create_generator_failed 336397324L
#define isc_dsql_set_generator_failed 336397325L
+#define isc_dsql_wlock_simple 336397326L
+#define isc_dsql_firstskip_rows 336397327L
+#define isc_dsql_wlock_aggregates 336397328L
+#define isc_dsql_wlock_conflict 336397329L
#define isc_gsec_cant_open_db 336723983L
#define isc_gsec_switches_error 336723984L
#define isc_gsec_no_op_spec 336723985L
@@ -2530,7 +2538,7 @@
#define isc_trace_switch_param_miss 337182758L
#define isc_trace_param_act_notcompat 337182759L
#define isc_trace_mandatory_switch_miss 337182760L
-#define isc_err_max 1224
+#define isc_err_max 1228
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/include/gen/msgs.h 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1148,6 +1148,10 @@
{336397323, "ALTER SEQUENCE @1 failed"}, /* dsql_alter_sequence_failed */
{336397324, "CREATE GENERATOR @1 failed"}, /* dsql_create_generator_failed */
{336397325, "SET GENERATOR @1 failed"}, /* dsql_set_generator_failed */
+ {336397326, "WITH LOCK can be used only with a single physical table"}, /* dsql_wlock_simple */
+ {336397327, "FIRST/SKIP cannot be used with ROWS"}, /* dsql_firstskip_rows */
+ {336397328, "WITH LOCK cannot be used with aggregates"}, /* dsql_wlock_aggregates */
+ {336397329, "WITH LOCK cannot be used with @1"}, /* dsql_wlock_conflict */
{336723983, "unable to open database"}, /* gsec_cant_open_db */
{336723984, "error in switch specifications"}, /* gsec_switches_error */
{336723985, "no operation specified"}, /* gsec_no_op_spec */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/include/gen/sql_code.h 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1144,6 +1144,10 @@
{336397323, -901}, /* 1035 dsql_alter_sequence_failed */
{336397324, -901}, /* 1036 dsql_create_generator_failed */
{336397325, -901}, /* 1037 dsql_set_generator_failed */
+ {336397326, -104}, /* 1038 dsql_wlock_simple */
+ {336397327, -104}, /* 1039 dsql_firstskip_rows */
+ {336397328, -104}, /* 1040 dsql_wlock_aggregates */
+ {336397329, -104}, /* 1041 dsql_wlock_conflict */
{336723983, -901}, /* 15 gsec_cant_open_db */
{336723984, -901}, /* 16 gsec_switches_error */
{336723985, -901}, /* 17 gsec_no_op_spec */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/include/gen/sql_state.h 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1144,6 +1144,10 @@
{336397323, "42000"}, // 1035 dsql_alter_sequence_failed
{336397324, "42000"}, // 1036 dsql_create_generator_failed
{336397325, "42000"}, // 1037 dsql_set_generator_failed
+ {336397326, "42000"}, // 1038 dsql_wlock_simple
+ {336397327, "42000"}, // 1039 dsql_firstskip_rows
+ {336397328, "42000"}, // 1040 dsql_wlock_aggregates
+ {336397329, "42000"}, // 1041 dsql_wlock_conflict
{336723983, "00000"}, // 15 gsec_cant_open_db
{336723984, "00000"}, // 16 gsec_switches_error
{336723985, "00000"}, // 17 gsec_no_op_spec
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/msgs/facilities2.sql 2014-05-03 00:27:47 UTC (rev 59526)
@@ -10,7 +10,7 @@
('1996-11-07 13:39:40', 'INSTALL', 10, 1)
('1996-11-07 13:38:41', 'TEST', 11, 4)
('2014-04-25 18:59:33', 'GBAK', 12, 357)
-('2014-04-04 16:36:53', 'SQLERR', 13, 1038)
+('2014-05-02 19:19:51', 'SQLERR', 13, 1042)
('1996-11-07 13:38:42', 'SQLWARN', 14, 613)
('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307)
('2014-04-08 14:23:23', 'ISQL', 17, 186)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/msgs/messages2.sql 2014-05-03 00:27:47 UTC (rev 59526)
@@ -2584,6 +2584,10 @@
('dsql_alter_sequence_failed', 'putErrorPrefix', 'DdlNodes.h', NULL, 13, 1035, NULL, 'ALTER SEQUENCE @1 failed', NULL, NULL);
('dsql_create_generator_failed', 'putErrorPrefix', 'DdlNodes.h', NULL, 13, 1036, NULL, 'CREATE GENERATOR @1 failed', NULL, NULL);
('dsql_set_generator_failed', 'putErrorPrefix', 'DdlNodes.h', NULL, 13, 1037, NULL, 'SET GENERATOR @1 failed', NULL, NULL);
+('dsql_wlock_simple', 'pass1_rse_impl', 'pass1.cpp', NULL, 13, 1038, NULL, 'WITH LOCK can be used only with a single physical table', NULL, NULL);
+('dsql_firstskip_rows', 'pass1_rse_impl', 'pass1.cpp', NULL, 13, 1039, NULL, 'FIRST/SKIP cannot be used with ROWS', NULL, NULL);
+('dsql_wlock_aggregates', 'pass1_rse_impl', 'pass1.cpp', NULL, 13, 1040, NULL, 'WITH LOCK cannot be used with aggregates', NULL, NULL);
+('dsql_wlock_conflict', NULL, 'pass1.cpp', NULL, 13, 1041, NULL, 'WITH LOCK cannot be used with @1', NULL, NULL);
-- SQLWARN
(NULL, NULL, NULL, NULL, 14, 100, NULL, 'Row not found for fetch, update or delete, or the result of a query is an empty table.', NULL, NULL);
(NULL, NULL, NULL, NULL, 14, 101, NULL, 'segment buffer length shorter than expected', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2014-05-02 03:04:56 UTC (rev 59525)
+++ firebird/trunk/src/msgs/system_errors2.sql 2014-05-03 00:27:47 UTC (rev 59526)
@@ -1138,6 +1138,10 @@
(-901, '42', '000', 13, 1035, 'dsql_alter_sequence_failed', NULL, NULL)
(-901, '42', '000', 13, 1036, 'dsql_create_generator_failed', NULL, NULL)
(-901, '42', '000', 13, 1037, 'dsql_set_generator_failed', NULL, NULL)
+(-104, '42', '000', 13, 1038, 'dsql_wlock_simple', NULL, NULL)
+(-104, '42', '000', 13, 1039, 'dsql_firstskip_rows', NULL, NULL)
+(-104, '42', '000', 13, 1040, 'dsql_wlock_aggregates', NULL, NULL)
+(-104, '42', '000', 13, 1041, 'dsql_wlock_conflict', NULL, NULL)
-- GSEC
(-901, '00', '000', 18, 15, 'gsec_cant_open_db', NULL, NULL)
(-901, '00', '000', 18, 16, 'gsec_switches_error', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
