Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[62968] firebird/trunk
|
From: <aa...@us...> - 2016-02-14 13:10:26
|
Revision: 62968
http://sourceforge.net/p/firebird/code/62968
Author: aafemt
Date: 2016-02-14 13:10:23 +0000 (Sun, 14 Feb 2016)
Log Message:
-----------
Messages for CORE-5112
Modified Paths:
--------------
firebird/trunk/builds/win32/create_msgs.bat
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
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
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/builds/win32/create_msgs.bat
===================================================================
--- firebird/trunk/builds/win32/create_msgs.bat 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/builds/win32/create_msgs.bat 2016-02-14 13:10:23 UTC (rev 62968)
@@ -9,7 +9,7 @@
@if exist "%FB_GEN_DIR%\dbs\msg.fdb" del "%FB_GEN_DIR%\dbs\msg.fdb"
@echo create database '%FB_GEN_DB_DIR%/dbs/msg.fdb'; | "%FB_BIN_DIR%\isql" -q
-@set FB_MSG_ISQL=@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/msg.fdb -i %FB_ROOT_PATH%\src\msgs\
+@set FB_MSG_ISQL=@"%FB_BIN_DIR%\isql" -b -q %FB_GEN_DB_DIR%/dbs/msg.fdb -i %FB_ROOT_PATH%\src\msgs\
@%FB_MSG_ISQL%msg.sql
@echo.
@echo loading facilities
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2016-02-14 13:10:23 UTC (rev 62968)
@@ -1746,6 +1746,18 @@
PARAMETER (GDS__dsql_db_trigger_type_cant_change = 336003103)
INTEGER*4 GDS__dsql_record_version_table
PARAMETER (GDS__dsql_record_version_table = 336003104)
+ INTEGER*4 GDS__dsql_invalid_sqlda_version
+ PARAMETER (GDS__dsql_invalid_sqlda_version = 336003105)
+ INTEGER*4 GDS__dsql_sqlvar_index
+ PARAMETER (GDS__dsql_sqlvar_index = 336003106)
+ INTEGER*4 GDS__dsql_no_sqlind
+ PARAMETER (GDS__dsql_no_sqlind = 336003107)
+ INTEGER*4 GDS__dsql_no_sqldata
+ PARAMETER (GDS__dsql_no_sqldata = 336003108)
+ INTEGER*4 GDS__dsql_no_input_sqlda
+ PARAMETER (GDS__dsql_no_input_sqlda = 336003109)
+ INTEGER*4 GDS__dsql_no_output_sqlda
+ PARAMETER (GDS__dsql_no_output_sqlda = 336003110)
INTEGER*4 GDS__dyn_filter_not_found
PARAMETER (GDS__dyn_filter_not_found = 336068645)
INTEGER*4 GDS__dyn_func_not_found
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2016-02-14 13:10:23 UTC (rev 62968)
@@ -1741,6 +1741,18 @@
gds_dsql_db_trigger_type_cant_change = 336003103;
isc_dsql_record_version_table = 336003104;
gds_dsql_record_version_table = 336003104;
+ isc_dsql_invalid_sqlda_version = 336003105;
+ gds_dsql_invalid_sqlda_version = 336003105;
+ isc_dsql_sqlvar_index = 336003106;
+ gds_dsql_sqlvar_index = 336003106;
+ isc_dsql_no_sqlind = 336003107;
+ gds_dsql_no_sqlind = 336003107;
+ isc_dsql_no_sqldata = 336003108;
+ gds_dsql_no_sqldata = 336003108;
+ isc_dsql_no_input_sqlda = 336003109;
+ gds_dsql_no_input_sqlda = 336003109;
+ isc_dsql_no_output_sqlda = 336003110;
+ gds_dsql_no_output_sqlda = 336003110;
isc_dyn_filter_not_found = 336068645;
gds_dyn_filter_not_found = 336068645;
isc_dyn_func_not_found = 336068649;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/codetext.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -869,6 +869,12 @@
{"dsql_incompatible_trigger_type", 336003102},
{"dsql_db_trigger_type_cant_change", 336003103},
{"dsql_record_version_table", 336003104},
+ {"dsql_invalid_sqlda_version", 336003105},
+ {"dsql_sqlvar_index", 336003106},
+ {"dsql_no_sqlind", 336003107},
+ {"dsql_no_sqldata", 336003108},
+ {"dsql_no_input_sqlda", 336003109},
+ {"dsql_no_output_sqlda", 336003110},
{"dyn_filter_not_found", 336068645},
{"dyn_func_not_found", 336068649},
{"dyn_index_not_found", 336068656},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/iberror.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -903,6 +903,12 @@
const ISC_STATUS isc_dsql_incompatible_trigger_type = 336003102L;
const ISC_STATUS isc_dsql_db_trigger_type_cant_change = 336003103L;
const ISC_STATUS isc_dsql_record_version_table = 336003104L;
+const ISC_STATUS isc_dsql_invalid_sqlda_version = 336003105L;
+const ISC_STATUS isc_dsql_sqlvar_index = 336003106L;
+const ISC_STATUS isc_dsql_no_sqlind = 336003107L;
+const ISC_STATUS isc_dsql_no_sqldata = 336003108L;
+const ISC_STATUS isc_dsql_no_input_sqlda = 336003109L;
+const ISC_STATUS isc_dsql_no_output_sqlda = 336003110L;
const ISC_STATUS isc_dyn_filter_not_found = 336068645L;
const ISC_STATUS isc_dyn_func_not_found = 336068649L;
const ISC_STATUS isc_dyn_index_not_found = 336068656L;
@@ -1308,7 +1314,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 = 1252;
+const ISC_STATUS isc_err_max = 1258;
#else /* c definitions */
@@ -2181,6 +2187,12 @@
#define isc_dsql_incompatible_trigger_type 336003102L
#define isc_dsql_db_trigger_type_cant_change 336003103L
#define isc_dsql_record_version_table 336003104L
+#define isc_dsql_invalid_sqlda_version 336003105L
+#define isc_dsql_sqlvar_index 336003106L
+#define isc_dsql_no_sqlind 336003107L
+#define isc_dsql_no_sqldata 336003108L
+#define isc_dsql_no_input_sqlda 336003109L
+#define isc_dsql_no_output_sqlda 336003110L
#define isc_dyn_filter_not_found 336068645L
#define isc_dyn_func_not_found 336068649L
#define isc_dyn_index_not_found 336068656L
@@ -2586,7 +2598,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 1252
+#define isc_err_max 1258
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/msgs.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -284,7 +284,7 @@
{335544580, "Table unknown"}, /* dsql_relation_err */
{335544581, "Procedure unknown"}, /* dsql_procedure_err */
{335544582, "Request unknown"}, /* dsql_request_err */
- {335544583, "SQLDA missing or incorrect version, or incorrect number/type of variables"}, /* dsql_sqlda_err */
+ {335544583, "SQLDA error"}, /* dsql_sqlda_err */
{335544584, "Count of read-write columns does not equal count of values"}, /* dsql_var_count_err */
{335544585, "Invalid statement handle"}, /* dsql_stmt_handle */
{335544586, "Function unknown"}, /* dsql_function_err */
@@ -872,6 +872,12 @@
{336003102, "Incompatible trigger type"}, /* dsql_incompatible_trigger_type */
{336003103, "Database trigger type can't be changed"}, /* dsql_db_trigger_type_cant_change */
{336003104, "To be used with RDB$RECORD_VERSION, @1 must be a table or a view of single table"}, /* dsql_record_version_table */
+ {336003105, "SQLDA version expected between @1 and @2, found @3"}, /* dsql_invalid_sqlda_version */
+ {336003106, "at SQLVAR index @1"}, /* dsql_sqlvar_index */
+ {336003107, "empty pointer to NULL indicator variable"}, /* dsql_no_sqlind */
+ {336003108, "empty pointer to data"}, /* dsql_no_sqldata */
+ {336003109, "No SQLDA for input values provided"}, /* dsql_no_input_sqlda */
+ {336003110, "No SQLDA for output values provided"}, /* dsql_no_output_sqlda */
{336068645, "BLOB Filter @1 not found"}, /* dyn_filter_not_found */
{336068649, "Function @1 not found"}, /* dyn_func_not_found */
{336068656, "Index not found"}, /* dyn_index_not_found */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/sql_code.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -868,6 +868,12 @@
{336003102, -817}, /* 30 dsql_incompatible_trigger_type */
{336003103, -817}, /* 31 dsql_db_trigger_type_cant_change */
{336003104, -607}, /* 32 dsql_record_version_table */
+ {336003105, -802}, /* 33 dsql_invalid_sqlda_version */
+ {336003106, -802}, /* 34 dsql_sqlvar_index */
+ {336003107, -802}, /* 35 dsql_no_sqlind */
+ {336003108, -802}, /* 36 dsql_no_sqldata */
+ {336003109, -802}, /* 37 dsql_no_input_sqlda */
+ {336003110, -802}, /* 38 dsql_no_output_sqlda */
{336068645, -901}, /* 37 dyn_filter_not_found */
{336068649, -901}, /* 41 dyn_func_not_found */
{336068656, -901}, /* 48 dyn_index_not_found */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/sql_state.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -868,6 +868,12 @@
{336003102, "42000"}, // 30 dsql_incompatible_trigger_type
{336003103, "42000"}, // 31 dsql_db_trigger_type_cant_change
{336003104, "HY000"}, // 32 dsql_record_version_table
+ {336003105, "07002"}, // 33 dsql_invalid_sqlda_version
+ {336003106, "07002"}, // 34 dsql_sqlvar_index
+ {336003107, "07002"}, // 35 dsql_no_sqlind
+ {336003108, "07002"}, // 36 dsql_no_sqldata
+ {336003109, "07002"}, // 37 dsql_no_input_sqlda
+ {336003110, "07002"}, // 38 dsql_no_output_sqlda
{336068645, "42000"}, // 37 dyn_filter_not_found
{336068649, "42000"}, // 41 dyn_func_not_found
{336068656, "42000"}, // 48 dyn_index_not_found
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/msgs/facilities2.sql 2016-02-14 13:10:23 UTC (rev 62968)
@@ -5,7 +5,7 @@
('2015-03-17 18:33:00', 'QLI', 1, 533)
('2015-01-07 18:01:51', 'GFIX', 3, 134)
('1996-11-07 13:39:40', 'GPRE', 4, 1)
-('2012-08-27 21:26:00', 'DSQL', 7, 33)
+('2012-08-27 21:26:00', 'DSQL', 7, 39)
('2015-10-07 12:30:00', 'DYN', 8, 291)
('1996-11-07 13:39:40', 'INSTALL', 10, 1)
('1996-11-07 13:38:41', 'TEST', 11, 4)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/msgs/messages2.sql 2016-02-14 13:10:23 UTC (rev 62968)
@@ -359,7 +359,7 @@
('dsql_relation_err', 'PASS1_make_context', 'dsql pass1.c', NULL, 0, 260, NULL, 'Table unknown', NULL, NULL);
('dsql_procedure_err', 'PASS1_statement', 'dsql pass1.c', NULL, 0, 261, NULL, 'Procedure unknown', NULL, NULL);
('dsql_request_err', 'lookup_stmt', 'dsql user_dsql.c', NULL, 0, 262, NULL, 'Request unknown', NULL, NULL);
-('dsql_sqlda_err', '(several)', 'dsql (several)', NULL, 0, 263, NULL, 'SQLDA missing or incorrect version, or incorrect number/type of variables', NULL, NULL);
+('dsql_sqlda_err', '(several)', 'dsql (several)', NULL, 0, 263, NULL, 'SQLDA error', NULL, NULL);
('dsql_var_count_err', 'pass1_insert', 'dsql pass1.c', NULL, 0, 264, NULL, 'Count of read-write columns does not equal count of values', NULL, NULL);
('dsql_stmt_handle', 'bad_sql_handle', 'whyb.c', NULL, 0, 265, NULL, 'Invalid statement handle', NULL, NULL);
('dsql_function_err', 'pass1_udf', 'dsql pass1.c', NULL, 0, 266, NULL, 'Function unknown', NULL, NULL);
@@ -1675,6 +1675,12 @@
('dsql_incompatible_trigger_type', 'define_trigger', 'ddl.cpp', NULL, 7, 30, NULL, 'Incompatible trigger type', NULL, NULL);
('dsql_db_trigger_type_cant_change', 'define_trigger', 'ddl.cpp', NULL, 7, 31, NULL, 'Database trigger type can''t be changed', NULL, NULL);
('dsql_record_version_table', 'MAKE_desc', 'ExprNodes.cpp', NULL, 7, 32, NULL, 'To be used with RDB$RECORD_VERSION, @1 must be a table or a view of single table', NULL, NULL);
+('dsql_invalid_sqlda_version', NULL, 'why.cpp', NULL, 7, 33, NULL, 'SQLDA version expected between @1 and @2, found @3', NULL, NULL);
+('dsql_sqlvar_index', NULL, 'why.cpp', NULL, 7, 34, NULL, 'at SQLVAR index @1', NULL, NULL);
+('dsql_no_sqlind', NULL, 'why.cpp', NULL, 7, 35, NULL, 'empty pointer to NULL indicator variable', NULL, NULL);
+('dsql_no_sqldata', NULL, 'why.cpp', NULL, 7, 36, NULL, 'empty pointer to data', NULL, NULL);
+('dsql_no_input_sqlda', NULL, NULL, NULL, 7, 37, NULL, 'No SQLDA for input values provided', NULL, NULL);
+('dsql_no_output_sqlda', NULL, NULL, NULL, 7, 38, NULL, 'No SQLDA for output values provided', NULL, NULL);
-- Do not change the arguments of the previous DSQL messages.
-- Write the new DSQL messages here.
-- DYN
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/msgs/system_errors2.sql 2016-02-14 13:10:23 UTC (rev 62968)
@@ -856,6 +856,12 @@
(-817, '42', '000', 7, 30, 'dsql_incompatible_trigger_type', NULL, NULL)
(-817, '42', '000', 7, 31, 'dsql_db_trigger_type_cant_change', NULL, NULL)
(-607, 'HY', '000', 7, 32, 'dsql_record_version_table', NULL, NULL)
+(-802, '07', '002', 7, 33, 'dsql_invalid_sqlda_version', NULL, NULL)
+(-802, '07', '002', 7, 34, 'dsql_sqlvar_index', NULL, NULL)
+(-802, '07', '002', 7, 35, 'dsql_no_sqlind', NULL, NULL)
+(-802, '07', '002', 7, 36, 'dsql_no_sqldata', NULL, NULL)
+(-802, '07', '002', 7, 37, 'dsql_no_input_sqlda', NULL, NULL)
+(-802, '07', '002', 7, 38, 'dsql_no_output_sqlda', NULL, NULL)
-- DYN
(-901, '42', '000', 8, 37, 'dyn_filter_not_found', NULL, NULL)
(-901, '42', '000', 8, 41, 'dyn_func_not_found', NULL, NULL)
Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/yvalve/why.cpp 2016-02-14 13:10:23 UTC (rev 62968)
@@ -84,7 +84,7 @@
static bool isNetworkError(const IStatus* status);
static void nullCheck(const FB_API_HANDLE* ptr, ISC_STATUS code);
//static void saveErrorString(ISC_STATUS* status);
-static void error804(ISC_STATUS err);
+static void badSqldaVersion(const short version);
static void sqldaDescribeParameters(XSQLDA* sqlda, IMessageMetadata* parameters);
static ISC_STATUS openOrCreateBlob(ISC_STATUS* userStatus, FB_API_HANDLE* dbHandle,
FB_API_HANDLE* traHandle, FB_API_HANDLE* blobHandle, ISC_QUAD* blobId,
@@ -226,10 +226,7 @@
{
if (sqlda && sqlda->version != SQLDA_VERSION1)
{
- (Arg::Gds(isc_dsql_sqlda_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "Invalid SQLDA version"
- ).raise();
+ badSqldaVersion(sqlda->version);
}
}
@@ -506,9 +503,8 @@
if (!var.sqlind)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to NULL indicator variable" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqlind) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -521,9 +517,8 @@
if (!var.sqldata && !*nullInd && (var.sqltype & ~1) != SQL_NULL)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to data" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqldata) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -558,9 +553,8 @@
if (!var.sqldata)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to data" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqldata) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -576,9 +570,8 @@
if (!var.sqlind)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to NULL indicator variable" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqlind) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -1443,12 +1436,12 @@
badHandle(code);
}
-// Raises a DSQL -804 error message.
-static void error804(ISC_STATUS err)
+static void badSqldaVersion(const short version)
{
- status_exception::raise(
- Arg::Gds(isc_dsql_error) << Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(err));
+ (Arg::Gds(isc_dsql_sqlda_value_err) <<
+ Arg::Gds(isc_dsql_invalid_sqlda_version) <<
+ Arg::Num(SQLDA_VERSION1) << Arg::Num(SQLDA_VERSION1) << Arg::Num(version)
+ ).raise();
}
// Set charset info in SQLVAR according to legacy rules
@@ -1473,7 +1466,7 @@
return;
if (sqlda->version != SQLDA_VERSION1)
- error804(isc_dsql_sqlda_err);
+ badSqldaVersion(sqlda->version);
StatusVector status(NULL);
CheckStatusWrapper statusWrapper(&status);
@@ -2516,7 +2509,7 @@
try
{
if (!sqlda)
- status_exception::raise(Arg::Gds(isc_dsql_sqlda_err) << Arg::Gds(isc_random) << "No output SQLDA for fetch");
+ status_exception::raise(Arg::Gds(isc_dsql_sqlda_err) << Arg::Gds(isc_dsql_no_output_sqlda));
RefPtr<IscStatement> statement(translateHandle(statements, stmtHandle));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
