firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 07:23:03 +01:00
Code Issues

Fixed CORE-4786: Problematic key value (when attempt to insert duplicate in PK/UK) is not shown where length of key >= 127 characters.

Browse Source
This commit is contained in:
dimitr 2015-05-08 17:47:20 +00:00
parent e8c0bbe524
commit ea574547da
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jrd/btr.cpp
View File

@ -6676,7 +6676,7 @@ string print_key(thread_db* tdbb, jrd_rel* relation, index_desc* idx, Record* re
class Printer class Printer
{ {
public: public:
explicit Printer(const dsc* desc) explicit Printer(thread_db* tdbb, const dsc* desc)
{ {
const int MAX_KEY_STRING_LEN = 250; const int MAX_KEY_STRING_LEN = 250;
const char* const NULL_KEY_STRING = "NULL"; const char* const NULL_KEY_STRING = "NULL";
@ -6689,12 +6689,11 @@ string print_key(thread_db* tdbb, jrd_rel* relation, index_desc* idx, Record* re
fb_assert(!desc->isBlob()); fb_assert(!desc->isBlob());
char temp[BUFFER_TINY]; MoveBuffer buffer;
const char* str = NULL; UCHAR* str = NULL;
const int len = MOV_make_string(desc, ttype_dynamic, &str, const int len = MOV_make_string2(tdbb, desc, ttype_dynamic, &str, buffer);
(vary*) temp, sizeof(temp));
value.assign(str, len); value.assign((const char*) str, len);
if (DTYPE_IS_TEXT(desc->dsc_dtype) || DTYPE_IS_DATE(desc->dsc_dtype)) if (DTYPE_IS_TEXT(desc->dsc_dtype) || DTYPE_IS_DATE(desc->dsc_dtype))
{ {
@ -6710,7 +6709,7 @@ string print_key(thread_db* tdbb, jrd_rel* relation, index_desc* idx, Record* re
char* s = hex.getBuffer(2 * len); char* s = hex.getBuffer(2 * len);
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
sprintf(s, "%02X", (int) (unsigned char) str[i]); sprintf(s, "%02X", (int) str[i]);
s += 2; s += 2;
} }
value = "x'" + hex + "'"; value = "x'" + hex + "'";
@ -6745,7 +6744,7 @@ string print_key(thread_db* tdbb, jrd_rel* relation, index_desc* idx, Record* re
{ {
bool notNull = false; bool notNull = false;
const dsc* const desc = BTR_eval_expression(tdbb, idx, record, notNull); const dsc* const desc = BTR_eval_expression(tdbb, idx, record, notNull);
value = Printer(notNull ? desc : NULL).get(); value = Printer(tdbb, notNull ? desc : NULL).get();
key += "<expression> = " + value; key += "<expression> = " + value;
} }
else else
@ -6764,7 +6763,7 @@ string print_key(thread_db* tdbb, jrd_rel* relation, index_desc* idx, Record* re
dsc desc; dsc desc;
const bool notNull = EVL_field(relation, record, field_id, &desc); const bool notNull = EVL_field(relation, record, field_id, &desc);
value = Printer(notNull ? &desc : NULL).get(); value = Printer(tdbb, notNull ? &desc : NULL).get();
key += " = " + value; key += " = " + value;
if (i < idx->idx_count - 1) if (i < idx->idx_count - 1)