Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[61305] firebird/trunk
|
From: <asf...@us...> - 2015-04-13 18:35:55
|
Revision: 61305
http://sourceforge.net/p/firebird/code/61305
Author: asfernandes
Date: 2015-04-13 18:35:46 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Fixed CORE-4725 - Inconsistencies with ALTER DOMAIN and ALTER TABLE with DROP NOT NULL and PRIMARY KEYs; Fixed some others problems with trailing spaces in object names in error messages.
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/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/jrd/trig.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 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2015-04-13 18:35:46 UTC (rev 61305)
@@ -1616,6 +1616,8 @@
PARAMETER (GDS__fun_param_mismatch = 335545101)
INTEGER*4 GDS__savepoint_backout_err
PARAMETER (GDS__savepoint_backout_err = 335545102)
+ INTEGER*4 GDS__domain_primary_key_notnull
+ PARAMETER (GDS__domain_primary_key_notnull = 335545103)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2015-04-13 18:35:46 UTC (rev 61305)
@@ -815,6 +815,7 @@
gds_interface_version_too_old = 335545100;
gds_fun_param_mismatch = 335545101;
gds_savepoint_backout_err = 335545102;
+ gds_domain_primary_key_notnull = 335545103;
gds_gfix_db_name = 335740929;
gds_gfix_invalid_sw = 335740930;
gds_gfix_incmp_sw = 335740932;
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2015-04-13 18:35:46 UTC (rev 61305)
@@ -1737,7 +1737,7 @@
if (FUN.RDB$SYSTEM_FLAG)
{
status_exception::raise(
- Arg::Gds(isc_dyn_cannot_mod_sysfunc) << FUN.RDB$FUNCTION_NAME);
+ Arg::Gds(isc_dyn_cannot_mod_sysfunc) << MetaName(FUN.RDB$FUNCTION_NAME));
}
if (!secondPass && runTriggers && package.isEmpty())
@@ -2357,7 +2357,11 @@
FUN.RDB$PACKAGE_NAME EQUIV NULLIF(package.c_str(), '')
{
if (FUN.RDB$SYSTEM_FLAG)
- status_exception::raise(Arg::Gds(isc_dyn_cannot_mod_sysfunc) << FUN.RDB$FUNCTION_NAME);
+ {
+ status_exception::raise(
+ Arg::Gds(isc_dyn_cannot_mod_sysfunc) <<
+ MetaName(FUN.RDB$FUNCTION_NAME));
+ }
if (package.isEmpty())
executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_BEFORE, DDL_TRIGGER_DROP_FUNCTION, name);
@@ -2689,7 +2693,11 @@
P.RDB$PACKAGE_NAME EQUIV NULLIF(package.c_str(), '')
{
if (P.RDB$SYSTEM_FLAG)
- status_exception::raise(Arg::Gds(isc_dyn_cannot_mod_sysproc) << P.RDB$PROCEDURE_NAME);
+ {
+ status_exception::raise(
+ Arg::Gds(isc_dyn_cannot_mod_sysproc) <<
+ MetaName(P.RDB$PROCEDURE_NAME));
+ }
if (!secondPass && runTriggers && package.isEmpty())
{
@@ -3122,7 +3130,11 @@
PRC.RDB$PACKAGE_NAME EQUIV NULLIF(package.c_str(), '')
{
if (PRC.RDB$SYSTEM_FLAG)
- status_exception::raise(Arg::Gds(isc_dyn_cannot_mod_sysproc) << PRC.RDB$PROCEDURE_NAME);
+ {
+ status_exception::raise(
+ Arg::Gds(isc_dyn_cannot_mod_sysproc) <<
+ MetaName(PRC.RDB$PROCEDURE_NAME));
+ }
if (package.isEmpty())
{
@@ -3242,7 +3254,7 @@
case fb_sysflag_system:
status_exception::raise(
- Arg::Gds(isc_dyn_cannot_mod_systrig) << TRG.RDB$TRIGGER_NAME);
+ Arg::Gds(isc_dyn_cannot_mod_systrig) << MetaName(TRG.RDB$TRIGGER_NAME));
break;
default:
@@ -3590,7 +3602,7 @@
case fb_sysflag_system:
status_exception::raise(
- Arg::Gds(isc_dyn_cannot_mod_systrig) << X.RDB$TRIGGER_NAME);
+ Arg::Gds(isc_dyn_cannot_mod_systrig) << MetaName(X.RDB$TRIGGER_NAME));
break;
default:
@@ -4736,6 +4748,30 @@
{
FLD.RDB$NULL_FLAG.NULL = FALSE;
FLD.RDB$NULL_FLAG = notNullFlag.value;
+
+ if (!notNullFlag.value)
+ {
+ AutoRequest request2;
+
+ FOR(REQUEST_HANDLE request2 TRANSACTION_HANDLE transaction)
+ RFL IN RDB$RELATION_FIELDS CROSS
+ IND IN RDB$INDICES CROSS
+ INDSEG IN RDB$INDEX_SEGMENTS CROSS
+ RELCON IN RDB$RELATION_CONSTRAINTS
+ WITH RFL.RDB$FIELD_SOURCE EQ name.c_str() AND
+ (RFL.RDB$NULL_FLAG MISSING OR RFL.RDB$NULL_FLAG EQ 0) AND
+ IND.RDB$RELATION_NAME EQ RFL.RDB$RELATION_NAME AND
+ INDSEG.RDB$INDEX_NAME EQ IND.RDB$INDEX_NAME AND
+ INDSEG.RDB$FIELD_NAME EQ RFL.RDB$FIELD_NAME AND
+ RELCON.RDB$INDEX_NAME EQ INDSEG.RDB$INDEX_NAME AND
+ RELCON.RDB$CONSTRAINT_TYPE EQ PRIMARY_KEY
+ {
+ status_exception::raise(
+ Arg::Gds(isc_domain_primary_key_notnull) <<
+ MetaName(RFL.RDB$RELATION_NAME));
+ }
+ END_FOR
+ }
}
if (type)
@@ -4796,9 +4832,9 @@
if (!newDom.dyn_dsc.isExact() || newDom.dyn_dsc.dsc_scale != 0)
{
- AutoCacheRequest request(tdbb, drq_l_ident_gens, DYN_REQUESTS);
+ AutoCacheRequest request2(tdbb, drq_l_ident_gens, DYN_REQUESTS);
- FOR (REQUEST_HANDLE request TRANSACTION_HANDLE transaction)
+ FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE transaction)
RFR IN RDB$RELATION_FIELDS
WITH RFR.RDB$FIELD_SOURCE = FLD.RDB$FIELD_NAME AND
RFR.RDB$GENERATOR_NAME NOT MISSING
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/include/gen/codetext.h 2015-04-13 18:35:46 UTC (rev 61305)
@@ -804,6 +804,7 @@
{"interface_version_too_old", 335545100},
{"fun_param_mismatch", 335545101},
{"savepoint_backout_err", 335545102},
+ {"domain_primary_key_notnull", 335545103},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/include/gen/iberror.h 2015-04-13 18:35:46 UTC (rev 61305)
@@ -838,6 +838,7 @@
const ISC_STATUS isc_interface_version_too_old = 335545100L;
const ISC_STATUS isc_fun_param_mismatch = 335545101L;
const ISC_STATUS isc_savepoint_backout_err = 335545102L;
+const ISC_STATUS isc_domain_primary_key_notnull = 335545103L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@@ -1296,7 +1297,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 = 1240;
+const ISC_STATUS isc_err_max = 1241;
#else /* c definitions */
@@ -2104,6 +2105,7 @@
#define isc_interface_version_too_old 335545100L
#define isc_fun_param_mismatch 335545101L
#define isc_savepoint_backout_err 335545102L
+#define isc_domain_primary_key_notnull 335545103L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@@ -2562,7 +2564,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 1240
+#define isc_err_max 1241
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/include/gen/msgs.h 2015-04-13 18:35:46 UTC (rev 61305)
@@ -807,6 +807,7 @@
{335545100, "Interface @3 version too old: expected @1, found @2"}, /* interface_version_too_old */
{335545101, "Input parameter mismatch for function @1"}, /* fun_param_mismatch */
{335545102, "Error during savepoint backout - transaction invalidated"}, /* savepoint_backout_err */
+ {335545103, "Domain used in the PRIMARY KEY constraint of table @1 must be NOT NULL"}, /* domain_primary_key_notnull */
{335740929, "data base file name (@1) already given"}, /* gfix_db_name */
{335740930, "invalid switch @1"}, /* gfix_invalid_sw */
{335740932, "incompatible switch combination"}, /* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/include/gen/sql_code.h 2015-04-13 18:35:46 UTC (rev 61305)
@@ -803,6 +803,7 @@
{335545100, -804}, /* 780 interface_version_too_old */
{335545101, -170}, /* 781 fun_param_mismatch */
{335545102, -901}, /* 782 savepoint_backout_err */
+ {335545103, -291}, /* 783 domain_primary_key_notnull */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/include/gen/sql_state.h 2015-04-13 18:35:46 UTC (rev 61305)
@@ -803,6 +803,7 @@
{335545100, "HY000"}, // 780 interface_version_too_old
{335545101, "07001"}, // 781 fun_param_mismatch
{335545102, "HY000"}, // 782 savepoint_backout_err
+ {335545103, "42000"}, // 783 domain_primary_key_notnull
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw
Modified: firebird/trunk/src/jrd/trig.h
===================================================================
--- firebird/trunk/src/jrd/trig.h 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/jrd/trig.h 2015-04-13 18:35:46 UTC (rev 61305)
@@ -1226,139 +1226,199 @@
static const TEXT trigger_10_msg_1 [] = "Column used in a PRIMARY constraint must be NOT NULL.";
******/
+/***
+create trigger rdb$trigger_10 before delete on rdb$relation_constraints
+as
+begin
+ if (old.rdb$constraint_type in ('PRIMARY KEY', 'UNIQUE')) then
+ begin
+ if (exists(
+ select 1
+ from rdb$ref_constraints
+ where rdb$const_name_uq = old.rdb$constraint_name)) then
+ begin
+ exit; -- FIXME: blr_leave, 1
+ end
+ end
+
+ if (old.rdb$constraint_type = 'FOREIGN KEY') then
+ begin
+ delete from rdb$ref_constraints
+ where rdb$constraint_name = old.rdb$constraint_name;
+ end
+
+ if (old.rdb$constraint_type = 'NOT NULL') then
+ begin
+ for select idxseg.rdb$index_name
+ from rdb$check_constraints chkcon,
+ rdb$relation_fields rfl,
+ rdb$fields fld,
+ rdb$indices ind,
+ rdb$index_segments idxseg
+ where chkcon.rdb$constraint_name = old.rdb$constraint_name and
+ rfl.rdb$field_name = chkcon.rdb$trigger_name and
+ rfl.rdb$relation_name = old.rdb$relation_name and
+ rfl.rdb$field_name = idxseg.rdb$field_name and
+ fld.rdb$field_name = rfl.rdb$field_source and
+ (fld.rdb$null_flag is null or fld.rdb$null_flag = 0) and
+ ind.rdb$relation_name = old.rdb$relation_name and
+ ind.rdb$index_name = idxseg.rdb$index_name
+ as cursor c1
+ do
+ begin
+ if (exists(
+ select 1
+ from rdb$relation_constraints
+ where rdb$index_name = :c1.rdb$index_name and
+ rdb$constraint_type = 'PRIMARY KEY')) then
+ begin
+ exit; -- FIXME: blr_leave, 2
+ end
+ end
+ end
+end
+***/
+
static const UCHAR trigger10[] =
{
blr_version5,
blr_begin,
- blr_if,
- blr_or,
- blr_eql,
- blr_field, 0, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'T', 'Y', 'P', 'E',
- blr_literal, blr_text, 11, 0, 'P', 'R', 'I', 'M', 'A', 'R', 'Y', 32, 'K',
- 'E', 'Y',
- blr_eql,
- blr_field, 0, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'T', 'Y', 'P', 'E',
- blr_literal, blr_text, 6, 0, 'U', 'N', 'I', 'Q', 'U', 'E',
- blr_begin,
- blr_if,
- blr_any,
- blr_rse, 1,
- blr_relation, 19, 'R', 'D', 'B', '$', 'R', 'E', 'F', '_', 'C', 'O', 'N',
- 'S', 'T', 'R', 'A', 'I', 'N', 'T', 'S', 3,
- blr_boolean,
- blr_eql,
- blr_field, 3, 17, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', '_', 'N',
- 'A', 'M', 'E', '_', 'U', 'Q',
- blr_field, 0, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'N', 'A', 'M', 'E',
- blr_end,
- blr_leave, 1,
- blr_end,
- blr_end,
- blr_end,
- blr_if,
- blr_eql,
- blr_field, 0, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'T', 'Y', 'P', 'E',
- blr_literal, blr_text, 11, 0, 'F', 'O', 'R', 'E', 'I', 'G', 'N', 32, 'K',
- 'E', 'Y',
- blr_begin,
- blr_for,
- blr_rse, 1,
- blr_relation, 19, 'R', 'D', 'B', '$', 'R', 'E', 'F', '_', 'C', 'O', 'N',
- 'S', 'T', 'R', 'A', 'I', 'N', 'T', 'S', 4,
- blr_boolean,
- blr_eql,
- blr_field, 0, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'N', 'A', 'M', 'E',
- blr_field, 4, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'N', 'A', 'M', 'E',
- blr_end,
- blr_begin,
- blr_erase, 4,
- blr_end,
- blr_end,
- blr_end,
- blr_if,
- blr_eql,
- blr_field, 0, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'T', 'Y', 'P', 'E',
- blr_literal, blr_text, 8, 0, 'N', 'O', 'T', 32, 'N', 'U', 'L', 'L',
- blr_begin,
- blr_for,
- blr_rse, 4,
- blr_relation, 21, 'R', 'D', 'B', '$', 'C', 'H', 'E', 'C', 'K', '_', 'C',
- 'O', 'N', 'S', 'T', 'R', 'A', 'I', 'N', 'T', 'S', 5,
- blr_relation, 19, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
- 'N', '_', 'F', 'I', 'E', 'L', 'D', 'S', 6,
- blr_relation, 11, 'R', 'D', 'B', '$', 'I', 'N', 'D', 'I', 'C', 'E', 'S',
- 7,
- blr_relation, 18, 'R', 'D', 'B', '$', 'I', 'N', 'D', 'E', 'X', '_', 'S',
- 'E', 'G', 'M', 'E', 'N', 'T', 'S', 8,
- blr_boolean,
- blr_and,
- blr_eql,
- blr_field, 0, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'N', 'A', 'M', 'E',
- blr_field, 5, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'N', 'A', 'M', 'E',
- blr_and,
- blr_eql,
- blr_field, 6, 14, 'R', 'D', 'B', '$', 'F', 'I', 'E', 'L', 'D', '_', 'N',
- 'A', 'M', 'E',
- blr_field, 5, 16, 'R', 'D', 'B', '$', 'T', 'R', 'I', 'G', 'G', 'E', 'R',
- '_', 'N', 'A', 'M', 'E',
- blr_and,
- blr_eql,
- blr_field, 6, 17, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
- 'N', '_', 'N', 'A', 'M', 'E',
- blr_field, 0, 17, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
- 'N', '_', 'N', 'A', 'M', 'E',
- blr_and,
- blr_eql,
- blr_field, 6, 14, 'R', 'D', 'B', '$', 'F', 'I', 'E', 'L', 'D', '_', 'N',
- 'A', 'M', 'E',
- blr_field, 8, 14, 'R', 'D', 'B', '$', 'F', 'I', 'E', 'L', 'D', '_', 'N',
- 'A', 'M', 'E',
- blr_and,
- blr_eql,
- blr_field, 7, 17, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
- 'N', '_', 'N', 'A', 'M', 'E',
- blr_field, 0, 17, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
- 'N', '_', 'N', 'A', 'M', 'E',
- blr_eql,
- blr_field, 7, 14, 'R', 'D', 'B', '$', 'I', 'N', 'D', 'E', 'X', '_', 'N',
- 'A', 'M', 'E',
- blr_field, 8, 14, 'R', 'D', 'B', '$', 'I', 'N', 'D', 'E', 'X', '_', 'N',
- 'A', 'M', 'E',
- blr_end,
- blr_begin,
- blr_if,
- blr_any,
- blr_rse, 1,
- blr_relation, 24, 'R', 'D', 'B', '$', 'R', 'E', 'L', 'A', 'T', 'I', 'O',
- 'N', '_', 'C', 'O', 'N', 'S', 'T', 'R', 'A', 'I', 'N', 'T', 'S', 9,
- blr_boolean,
- blr_and,
- blr_eql,
- blr_field, 9, 14, 'R', 'D', 'B', '$', 'I', 'N', 'D', 'E', 'X', '_', 'N',
- 'A', 'M', 'E',
- blr_field, 8, 14, 'R', 'D', 'B', '$', 'I', 'N', 'D', 'E', 'X', '_', 'N',
- 'A', 'M', 'E',
- blr_eql,
- blr_field, 9, 19, 'R', 'D', 'B', '$', 'C', 'O', 'N', 'S', 'T', 'R', 'A',
- 'I', 'N', 'T', '_', 'T', 'Y', 'P', 'E',
- blr_literal, blr_text, 11, 0, 'P', 'R', 'I', 'M', 'A', 'R', 'Y', 32, 'K',
- 'E', 'Y',
- blr_end,
- blr_leave, 2,
- blr_end,
- blr_end,
- blr_end,
- blr_end,
- blr_end,
+ blr_label, 0,
+ blr_begin,
+ blr_begin,
+ blr_if,
+ blr_or,
+ blr_eql,
+ blr_field, 0, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','T','Y','P','E',
+ blr_literal, blr_text2, 0,0, 11,0, 'P','R','I','M','A','R','Y',32,'K','E','Y',
+ blr_eql,
+ blr_field, 0, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','T','Y','P','E',
+ blr_literal, blr_text2, 0,0, 6,0, 'U','N','I','Q','U','E',
+ blr_begin,
+ blr_begin,
+ blr_if,
+ blr_any,
+ blr_rse, 1,
+ blr_relation, 19, 'R','D','B','$','R','E','F','_','C','O','N','S','T','R','A','I','N','T','S', 2,
+ blr_boolean,
+ blr_eql,
+ blr_field, 2, 17, 'R','D','B','$','C','O','N','S','T','_','N','A','M','E','_','U','Q',
+ blr_field, 0, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','N','A','M','E',
+ blr_end,
+ blr_begin,
+ blr_begin,
+ blr_leave, 1,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_if,
+ blr_eql,
+ blr_field, 0, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','T','Y','P','E',
+ blr_literal, blr_text2, 0,0, 11,0, 'F','O','R','E','I','G','N',32,'K','E','Y',
+ blr_begin,
+ blr_begin,
+ blr_for,
+ blr_rse, 1,
+ blr_relation, 19, 'R','D','B','$','R','E','F','_','C','O','N','S','T','R','A','I','N','T','S', 3,
+ blr_boolean,
+ blr_eql,
+ blr_field, 3, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','N','A','M','E',
+ blr_field, 0, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','N','A','M','E',
+ blr_end,
+ blr_erase, 3,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_if,
+ blr_eql,
+ blr_field, 0, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','T','Y','P','E',
+ blr_literal, blr_text2, 0,0, 8,0, 'N','O','T',32,'N','U','L','L',
+ blr_begin,
+ blr_begin,
+ blr_label, 1,
+ blr_for,
+ blr_rse, 5,
+ blr_relation2, 21, 'R','D','B','$','C','H','E','C','K','_','C','O','N','S','T','R','A','I','N','T','S',
+ 9, 'C','1',32,'C','H','K','C','O','N', 4,
+ blr_relation2, 19, 'R','D','B','$','R','E','L','A','T','I','O','N','_','F','I','E','L','D','S',
+ 6, 'C','1',32,'R','F','L', 5,
+ blr_relation2, 10, 'R','D','B','$','F','I','E','L','D','S',
+ 6, 'C','1',32,'F','L','D', 6,
+ blr_relation2, 11, 'R','D','B','$','I','N','D','I','C','E','S',
+ 6, 'C','1',32,'I','N','D', 7,
+ blr_relation2, 18, 'R','D','B','$','I','N','D','E','X','_','S','E','G','M','E','N','T','S',
+ 9, 'C','1',32,'I','D','X','S','E','G', 8,
+ blr_boolean,
+ blr_and,
+ blr_and,
+ blr_and,
+ blr_and,
+ blr_and,
+ blr_and,
+ blr_and,
+ blr_eql,
+ blr_field, 4, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','N','A','M','E',
+ blr_field, 0, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','N','A','M','E',
+ blr_eql,
+ blr_field, 5, 14, 'R','D','B','$','F','I','E','L','D','_','N','A','M','E',
+ blr_field, 4, 16, 'R','D','B','$','T','R','I','G','G','E','R','_','N','A','M','E',
+ blr_eql,
+ blr_field, 5, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E',
+ blr_field, 0, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E',
+ blr_eql,
+ blr_field, 5, 14, 'R','D','B','$','F','I','E','L','D','_','N','A','M','E',
+ blr_field, 8, 14, 'R','D','B','$','F','I','E','L','D','_','N','A','M','E',
+ blr_eql,
+ blr_field, 6, 14, 'R','D','B','$','F','I','E','L','D','_','N','A','M','E',
+ blr_field, 5, 16, 'R','D','B','$','F','I','E','L','D','_','S','O','U','R','C','E',
+ blr_or,
+ blr_missing,
+ blr_field, 6, 13, 'R','D','B','$','N','U','L','L','_','F','L','A','G',
+ blr_eql,
+ blr_field, 6, 13, 'R','D','B','$','N','U','L','L','_','F','L','A','G',
+ blr_literal, blr_long, 0, 0,0,0,0,
+ blr_eql,
+ blr_field, 7, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E',
+ blr_field, 0, 17, 'R','D','B','$','R','E','L','A','T','I','O','N','_','N','A','M','E',
+ blr_eql,
+ blr_field, 7, 14, 'R','D','B','$','I','N','D','E','X','_','N','A','M','E',
+ blr_field, 8, 14, 'R','D','B','$','I','N','D','E','X','_','N','A','M','E',
+ blr_end,
+ blr_begin,
+ blr_begin,
+ blr_begin,
+ blr_if,
+ blr_any,
+ blr_rse, 1,
+ blr_relation, 24, 'R','D','B','$','R','E','L','A','T','I','O','N','_','C','O','N','S','T','R','A','I','N','T','S', 9,
+ blr_boolean,
+ blr_and,
+ blr_eql,
+ blr_field, 9, 14, 'R','D','B','$','I','N','D','E','X','_','N','A','M','E',
+ blr_derived_expr, 1, 8,
+ blr_field, 8, 14, 'R','D','B','$','I','N','D','E','X','_','N','A','M','E',
+ blr_eql,
+ blr_field, 9, 19, 'R','D','B','$','C','O','N','S','T','R','A','I','N','T','_','T','Y','P','E',
+ blr_literal, blr_text2, 0,0, 11,0, 'P','R','I','M','A','R','Y',32,'K','E','Y',
+ blr_end,
+ blr_begin,
+ blr_begin,
+ blr_leave, 2,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
+ blr_end,
blr_eoc
};
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/msgs/facilities2.sql 2015-04-13 18:35:46 UTC (rev 61305)
@@ -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 (?, ?, ?, ?);
--
-('2015-02-02 12:30:00', 'JRD', 0, 783)
+('2015-04-13 14:50:00', 'JRD', 0, 784)
('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)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/msgs/messages2.sql 2015-04-13 18:35:46 UTC (rev 61305)
@@ -890,6 +890,7 @@
('interface_version_too_old', NULL, 'Interface.h', NULL, 0, 780, NULL, 'Interface @3 version too old: expected @1, found @2', NULL, NULL);
('fun_param_mismatch', 'UdfCallNode::dsqlPass', 'ExprNode.cpp', NULL, 0, 781, NULL, 'Input parameter mismatch for function @1', NULL, NULL);
('savepoint_backout_err', 'VIO_verb_cleanup', 'vio.cpp', NULL, 0, 782, NULL, 'Error during savepoint backout - transaction invalidated', NULL, NULL);
+('domain_primary_key_notnull', NULL, 'DdlNodes.epp', NULL, 0, 783, NULL, 'Domain used in the PRIMARY KEY constraint of table @1 must be NOT NULL', NULL, NULL);
-- QLI
(NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
(NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2015-04-13 18:21:57 UTC (rev 61304)
+++ firebird/trunk/src/msgs/system_errors2.sql 2015-04-13 18:35:46 UTC (rev 61305)
@@ -789,6 +789,7 @@
(-804, 'HY', '000', 0, 780, 'interface_version_too_old', NULL, NULL)
(-170, '07', '001', 0, 781, 'fun_param_mismatch', NULL, NULL)
(-901, 'HY', '000', 0, 782, 'savepoint_backout_err', NULL, NULL)
+(-291, '42', '000', 0, 783, 'domain_primary_key_notnull', NULL, NULL)
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
