Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[59363] firebird/trunk
|
From: <ro...@us...> - 2014-04-04 20:30:08
|
Revision: 59363
http://sourceforge.net/p/firebird/code/59363
Author: robocop
Date: 2014-04-04 20:30:03 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
When I tried to modify a system domain, I got the confusing message "create domain failed", so I tried to improve the feedback to the user.
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DdlNodes.h
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-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2014-04-04 20:30:03 UTC (rev 59363)
@@ -2280,6 +2280,12 @@
PARAMETER (GDS__dsql_cte_recursive_aggregate = 336397321)
INTEGER*4 GDS__dsql_mapping_failed
PARAMETER (GDS__dsql_mapping_failed = 336397322)
+ INTEGER*4 GDS__dsql_alter_sequence_failed
+ PARAMETER (GDS__dsql_alter_sequence_failed = 336397323)
+ INTEGER*4 GDS__dsql_create_generator_failed
+ PARAMETER (GDS__dsql_create_generator_failed = 336397324)
+ INTEGER*4 GDS__dsql_set_generator_failed
+ PARAMETER (GDS__dsql_set_generator_failed = 336397325)
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-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2014-04-04 20:30:03 UTC (rev 59363)
@@ -1147,6 +1147,9 @@
gds_dsql_revoke_failed = 336397320;
gds_dsql_cte_recursive_aggregate = 336397321;
gds_dsql_mapping_failed = 336397322;
+ gds_dsql_alter_sequence_failed = 336397323;
+ gds_dsql_create_generator_failed = 336397324;
+ gds_dsql_set_generator_failed = 336397325;
gds_gsec_cant_open_db = 336723983;
gds_gsec_switches_error = 336723984;
gds_gsec_no_op_spec = 336723985;
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2014-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2014-04-04 20:30:03 UTC (rev 59363)
@@ -4868,6 +4868,31 @@
}
+void CreateAlterSequenceNode::putErrorPrefix(Firebird::Arg::StatusVector& statusVector)
+{
+ // Possibilities I see in parse.y
+ //CREATE SEQ -> !legacy, create, !alter
+ //REPL SEQ (create or alter) -> !legacy, create, alter
+ //ALTER SEQ -> !legacy, !create, alter
+ //SET GENERATOR -> legacy, !create, alter
+ ISC_STATUS rc = 0;
+ if (legacy)
+ {
+ if (alter)
+ rc = isc_dsql_set_generator_failed;
+ else
+ rc = isc_dsql_create_sequence_failed; // no way to distinguish
+ }
+ else
+ {
+ if (alter)
+ rc = isc_dsql_alter_sequence_failed;
+ else
+ rc = isc_dsql_create_sequence_failed;
+ }
+ statusVector << Firebird::Arg::Gds(rc) << name;
+}
+
void CreateAlterSequenceNode::executeCreate(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch,
jrd_tra* transaction)
{
Modified: firebird/trunk/src/dsql/DdlNodes.h
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.h 2014-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/dsql/DdlNodes.h 2014-04-04 20:30:03 UTC (rev 59363)
@@ -935,10 +935,7 @@
}
protected:
- virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector)
- {
- statusVector << Firebird::Arg::Gds(isc_dsql_create_sequence_failed) << name;
- }
+ virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector);
private:
void executeCreate(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd_tra* transaction);
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2014-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/include/gen/codetext.h 2014-04-04 20:30:03 UTC (rev 59363)
@@ -1136,6 +1136,9 @@
{"dsql_revoke_failed", 336397320},
{"dsql_cte_recursive_aggregate", 336397321},
{"dsql_mapping_failed", 336397322},
+ {"dsql_alter_sequence_failed", 336397323},
+ {"dsql_create_generator_failed", 336397324},
+ {"dsql_set_generator_failed", 336397325},
{"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-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/include/gen/iberror.h 2014-04-04 20:30:03 UTC (rev 59363)
@@ -1170,6 +1170,9 @@
const ISC_STATUS isc_dsql_revoke_failed = 336397320L;
const ISC_STATUS isc_dsql_cte_recursive_aggregate = 336397321L;
const ISC_STATUS isc_dsql_mapping_failed = 336397322L;
+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_gsec_cant_open_db = 336723983L;
const ISC_STATUS isc_gsec_switches_error = 336723984L;
const ISC_STATUS isc_gsec_no_op_spec = 336723985L;
@@ -1271,7 +1274,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 = 1215;
+const ISC_STATUS isc_err_max = 1218;
#else /* c definitions */
@@ -2411,6 +2414,9 @@
#define isc_dsql_revoke_failed 336397320L
#define isc_dsql_cte_recursive_aggregate 336397321L
#define isc_dsql_mapping_failed 336397322L
+#define isc_dsql_alter_sequence_failed 336397323L
+#define isc_dsql_create_generator_failed 336397324L
+#define isc_dsql_set_generator_failed 336397325L
#define isc_gsec_cant_open_db 336723983L
#define isc_gsec_switches_error 336723984L
#define isc_gsec_no_op_spec 336723985L
@@ -2512,7 +2518,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 1215
+#define isc_err_max 1218
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2014-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/include/gen/msgs.h 2014-04-04 20:30:03 UTC (rev 59363)
@@ -1139,6 +1139,9 @@
{336397320, "REVOKE failed"}, /* dsql_revoke_failed */
{336397321, "Recursive member of CTE cannot use aggregate or window function"}, /* dsql_cte_recursive_aggregate */
{336397322, "@2 MAPPING @1 failed"}, /* dsql_mapping_failed */
+ {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 */
{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-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/include/gen/sql_code.h 2014-04-04 20:30:03 UTC (rev 59363)
@@ -1135,6 +1135,9 @@
{336397320, -901}, /* 1032 dsql_revoke_failed */
{336397321, -104}, /* 1033 dsql_cte_recursive_aggregate */
{336397322, -901}, /* 1034 dsql_mapping_failed */
+ {336397323, -901}, /* 1035 dsql_alter_sequence_failed */
+ {336397324, -901}, /* 1036 dsql_create_generator_failed */
+ {336397325, -901}, /* 1037 dsql_set_generator_failed */
{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-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/include/gen/sql_state.h 2014-04-04 20:30:03 UTC (rev 59363)
@@ -1135,6 +1135,9 @@
{336397320, "42000"}, // 1032 dsql_revoke_failed
{336397321, "42000"}, // 1033 dsql_cte_recursive_aggregate
{336397322, "42000"}, // 1034 dsql_mapping_failed
+ {336397323, "42000"}, // 1035 dsql_alter_sequence_failed
+ {336397324, "42000"}, // 1036 dsql_create_generator_failed
+ {336397325, "42000"}, // 1037 dsql_set_generator_failed
{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-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/msgs/facilities2.sql 2014-04-04 20:30:03 UTC (rev 59363)
@@ -10,7 +10,7 @@
('1996-11-07 13:39:40', 'INSTALL', 10, 1)
('1996-11-07 13:38:41', 'TEST', 11, 4)
('2014-04-04 16:08:08', 'GBAK', 12, 354)
-('2014-04-04 16:36:53', 'SQLERR', 13, 1035)
+('2014-04-04 16:36:53', 'SQLERR', 13, 1038)
('1996-11-07 13:38:42', 'SQLWARN', 14, 613)
('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307)
('2014-01-13 15:41:16', 'ISQL', 17, 184)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2014-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/msgs/messages2.sql 2014-04-04 20:30:03 UTC (rev 59363)
@@ -2572,6 +2572,9 @@
('dsql_revoke_failed', 'getMainErrorCode', 'DdlNodes.h', NULL, 13, 1032, NULL, 'REVOKE failed', NULL, NULL);
('dsql_cte_recursive_aggregate', 'pass1_rse_impl', 'dsql.cpp', NULL, 13, 1033, NULL, 'Recursive member of CTE cannot use aggregate or window function', NULL, NULL);
('dsql_mapping_failed', 'MappingNode::putErrorPrefix', 'DdlNodes.h', NULL, 13, 1034, NULL, '@2 MAPPING @1 failed', NULL, NULL);
+('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);
-- 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-04-04 18:39:55 UTC (rev 59362)
+++ firebird/trunk/src/msgs/system_errors2.sql 2014-04-04 20:30:03 UTC (rev 59363)
@@ -1128,7 +1128,10 @@
(-901, '42', '000', 13, 1031, 'dsql_grant_failed', NULL, NULL);
(-901, '42', '000', 13, 1032, 'dsql_revoke_failed', NULL, NULL);
(-104, '42', '000', 13, 1033, 'dsql_cte_recursive_aggregate', NULL, NULL)
-(-901, '42', '000', 13, 1034, 'dsql_mapping_failed', NULL, NULL);
+(-901, '42', '000', 13, 1034, 'dsql_mapping_failed', NULL, NULL)
+(-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)
-- 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.
|
