8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
This commit is contained in:
asfernandes 2009-10-23 00:42:40 +00:00
parent 33c071a669
commit dc5edd5aed
13 changed files with 22 additions and 22 deletions

View File

@ -5514,7 +5514,7 @@ bool get_procedure_prm (BurpGlobals* tdgbl, GDS_NAME package_name, GDS_NAME proc
}
else
X.RDB$PACKAGE_NAME.NULL = TRUE;
X.RDB$DESCRIPTION.NULL = TRUE;
X.RDB$DEFAULT_VALUE.NULL = TRUE;
X.RDB$DEFAULT_SOURCE.NULL = TRUE;

View File

@ -615,7 +615,7 @@ void CommentOnNode::execute(thread_db* tdbb, jrd_tra* transaction)
if (column.hasData())
{
sqlStmt += " where " + column + " = ?";
if (subColumn.hasData())
sqlStmt += " and " + subColumn + " = ?";
}
@ -636,7 +636,7 @@ void CommentOnNode::execute(thread_db* tdbb, jrd_tra* transaction)
if (column.hasData())
{
ps->setString(tdbb, ++n, objName);
if (subColumn.hasData())
ps->setString(tdbb, ++n, subName);
}
@ -1039,7 +1039,7 @@ void DropFunctionNode::execute(thread_db* tdbb, jrd_tra* transaction)
bool found = false;
AutoCacheRequest requestHandle(tdbb, drq_e_funcs, DYN_REQUESTS);
FOR (REQUEST_HANDLE requestHandle TRANSACTION_HANDLE transaction)
FUN IN RDB$FUNCTIONS
WITH FUN.RDB$FUNCTION_NAME EQ metaName.c_str() AND
@ -1690,7 +1690,7 @@ void CreateAlterProcedureNode::storeParameter(thread_db* tdbb, jrd_tra* transact
// ASF: I moved this block to write defaults on RDB$PROCEDURE_PARAMETERS.
// It was writing in RDB$FIELDS, but that would require special support
// for packaged procedures signature verification.
// for packaged procedures signature verification.
PRM.RDB$DEFAULT_VALUE.NULL = !parameter.legacyDefault;
PRM.RDB$DEFAULT_SOURCE.NULL = !parameter.legacyDefault;
@ -1871,7 +1871,7 @@ void DropProcedureNode::dropParameters(thread_db* tdbb, jrd_tra* transaction,
{
Database* dbb = tdbb->getDatabase();
AutoCacheRequest requestHandle(tdbb, drq_e_prms2, DYN_REQUESTS);
FOR (REQUEST_HANDLE requestHandle TRANSACTION_HANDLE transaction)
PRM IN RDB$PROCEDURE_PARAMETERS
WITH PRM.RDB$PROCEDURE_NAME EQ nameInMetaCharSet(tdbb, procedureName).c_str() AND
@ -1946,7 +1946,7 @@ void DropProcedureNode::execute(thread_db* tdbb, jrd_tra* transaction)
dropParameters(tdbb, transaction, metaName, package);
AutoCacheRequest requestHandle(tdbb, drq_e_prcs2, DYN_REQUESTS);
FOR (REQUEST_HANDLE requestHandle TRANSACTION_HANDLE transaction)
PRC IN RDB$PROCEDURES
WITH PRC.RDB$PROCEDURE_NAME EQ metaName.c_str() AND

View File

@ -8200,7 +8200,7 @@ static dsql_nod* pass1_rse_impl( CompiledStatement* statement, dsql_nod* input,
bool sortWindow = rse->nod_arg[e_rse_sort] &&
aggregate_found(statement, rse->nod_arg[e_rse_sort], true);
// WINDOW functions
if ((rse->nod_arg[e_rse_items] && aggregate_found(statement, rse->nod_arg[e_rse_items], true)) ||
sortWindow)

View File

@ -39,7 +39,7 @@ namespace Jrd {
ErrorImpl::~ErrorImpl()
{
for (ISC_STATUS* p = status; p <= next; p++)
for (ISC_STATUS* p = status; p <= next; p++)
{
if (*p == isc_arg_cstring)
{

View File

@ -44,7 +44,7 @@ using Firebird::uint;
namespace Jrd {
namespace
namespace
{
class PluginsMap : public GenericMap<Pair<Left<string, PluginImpl*> > >
{

View File

@ -94,7 +94,7 @@ public:
{
while (aCount-- > 0)
valuesArray.add();
values = &valuesArray;
}

View File

@ -820,7 +820,7 @@ void API_ROUTINE CVT_move(const dsc*, dsc*, FPTR_ERROR err)
}
///#if !defined(SUPERSERVER) || defined(SUPERCLIENT)
// AP: isc_*_user entrypoints are used only in any kind of embedded
// AP: isc_*_user entrypoints are used only in any kind of embedded
// server (both posix and windows) and fbclient
#ifndef BOOT_BUILD

View File

@ -136,12 +136,12 @@ const int drq_s_prc_usr_prvs = 79; // store procedure privileges
const int drq_s_intl_info = 84; // store RDB$CHARACTER_FIELDS
///const int drq_m_prcs = 85; // modify procedure
const int drq_s_log_files = 86; // store log files
const int drq_s_cache = 87; // store cache
const int drq_s_cache = 87; // store cache
///const int drq_e_prm = 88; // erase a procedure parameter
const int drq_s_xcp = 89; // store an exception
const int drq_m_xcp = 90; // modify an exception
///const int drq_e_prc_prvs = 91; // erase user privileges on procedure
///const int drq_e_prc_prv = 92; // erase procedure's privileges
///const int drq_e_prc_prv = 92; // erase procedure's privileges
const int drq_e_trg_prv = 93; // erase trigger's privileges
const int drq_d_log = 94; // drop log
const int drq_d_cache = 95; // drop cache

View File

@ -2961,7 +2961,7 @@ jrd_nod* EXE_looper(thread_db* tdbb, jrd_req* request, jrd_nod* in_node)
#endif
case nod_set_generator:
case nod_set_generator2:
case nod_set_generator2:
if (request->req_operation == jrd_req::req_evaluate)
{
SSHORT genId = (SSHORT)(IPTR) node->nod_arg[e_gen_id];

View File

@ -378,7 +378,7 @@ void FUN_evaluate(thread_db* tdbb, UserFunction* function, jrd_nod* node, impure
function->fun_external->execute(tdbb, node, value);
return;
}
UDF_ARG args[MAX_UDF_ARGUMENTS + 1];
HalfStaticArray<UCHAR, 800> temp;
@ -392,7 +392,7 @@ void FUN_evaluate(thread_db* tdbb, UserFunction* function, jrd_nod* node, impure
//Stack<blb*> blob_stack;
//blb* blob_created = 0;
OwnedBlobStack blob_stack(tdbb);
jrd_nod** ptr = node->nod_arg;
// We'll use to this trick to give the UDF a way to signal
@ -878,7 +878,7 @@ UserFunction* FUN_lookup_function(thread_db* tdbb, const QualifiedName& name)
function->fun_external = NULL;
function->fun_entrypoint =
Module::lookup(X.RDB$MODULE_NAME, X.RDB$ENTRYPOINT, dbb->dbb_modules);
// Could not find a function with given MODULE, ENTRYPOINT.
// Try the list of internally implemented functions.
if (!function->fun_entrypoint)

View File

@ -366,7 +366,7 @@ void Jrd::Trigger::compile(thread_db* tdbb)
throw;
}
request->req_trg_name = name;
if (sys_trigger)

View File

@ -51,7 +51,7 @@
#include "../jrd/os/guid.h"
#include "../jrd/sbm.h"
#include "../jrd/scl.h"
#include "../jrd/ExtEngineManager.h"
#ifdef DEV_BUILD

View File

@ -45,7 +45,7 @@ inline void SCL_check_access(Jrd::thread_db* tdbb,
SLONG view_id,
const Firebird::MetaName& trg_name,
const Firebird::MetaName& prc_name,
const Firebird::MetaName& pkg_name,
const Firebird::MetaName& pkg_name,
Jrd::SecurityClass::flags_t mask,
const TEXT* type,
const Firebird::string& name)
@ -57,7 +57,7 @@ inline void SCL_check_access(Jrd::thread_db* tdbb,
SLONG view_id,
const Firebird::MetaName& trg_name,
const Firebird::MetaName& prc_name,
const Firebird::MetaName& pkg_name,
const Firebird::MetaName& pkg_name,
Jrd::SecurityClass::flags_t mask,
const TEXT* type,
const Firebird::MetaName& name)