mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 01:23:03 +01:00
Misc
This commit is contained in:
parent
1a5d7b1150
commit
2ed85aef29
@ -223,15 +223,9 @@ public:
|
||||
return obj ? obj->as<T>() : NULL;
|
||||
}
|
||||
|
||||
template <typename T, typename LegacyType> static const T* const_as(const LegacyType* node)
|
||||
{
|
||||
const ExprNode* obj = T::fromLegacy(node);
|
||||
return obj ? obj->as<T>() : NULL;
|
||||
}
|
||||
|
||||
template <typename T, typename LegacyType> static bool is(const LegacyType* node)
|
||||
{
|
||||
ExprNode* obj = T::fromLegacy(node);
|
||||
const ExprNode* obj = T::fromLegacy(node);
|
||||
return obj ? obj->is<T>() : false;
|
||||
}
|
||||
|
||||
|
@ -66,7 +66,7 @@ typedef ISC_STATUS ISC_STATUS_ARRAY[ISC_STATUS_LENGTH];
|
||||
|
||||
/* SQL State as defined in the SQL Standard. */
|
||||
#define FB_SQLSTATE_LENGTH 5
|
||||
#define FB_SQLSTATE_SIZE FB_SQLSTATE_LENGTH + 1
|
||||
#define FB_SQLSTATE_SIZE (FB_SQLSTATE_LENGTH + 1)
|
||||
typedef char FB_SQLSTATE_STRING[FB_SQLSTATE_SIZE];
|
||||
|
||||
/******************************************************************/
|
||||
|
@ -1756,8 +1756,7 @@ void CMP_get_desc(thread_db* tdbb, CompilerScratch* csb, jrd_nod* node, DSC* des
|
||||
case nod_current_role:
|
||||
desc->dsc_dtype = dtype_text;
|
||||
desc->dsc_ttype() = ttype_metadata;
|
||||
// ASF: should be multiplied by maxBytesPerChar of ttype_metadata in the future
|
||||
desc->dsc_length = USERNAME_LENGTH;
|
||||
desc->dsc_length = USERNAME_LENGTH * METADATA_BYTES_PER_CHAR;
|
||||
desc->dsc_scale = 0;
|
||||
desc->dsc_flags = 0;
|
||||
return;
|
||||
|
@ -4657,7 +4657,6 @@ static rem_port* analyze(PathName& file_name,
|
||||
|
||||
#endif // SUPERCLIENT
|
||||
|
||||
|
||||
if (port || status_vector[1])
|
||||
{
|
||||
return port;
|
||||
|
@ -40,4 +40,3 @@ rem_port* XNET_reconnect(ULONG, ISC_STATUS*);
|
||||
#endif
|
||||
|
||||
#endif // REMOTE_XNET_PROTO_H
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user