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

Backport fix for CORE-1012 - IBO problems with FB >= 1.5.3 "Error with joins and auto-generated search query"

Browse Source
This commit is contained in:
asfernandes 2006-12-03 17:52:12 +00:00
parent 7cef723f13
commit 7638ffc784
1 changed files with 20 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/dsql/make.cpp
View File

@ -2144,7 +2144,7 @@ static void make_placeholder_null(dsc* const desc)
static void make_parameter_names(dsql_par* parameter, const dsql_nod* item) static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
{ {
const dsql_fld* field; const dsql_fld* field;
const dsql_ctx* context; const dsql_ctx* context = NULL;
const dsql_str* string; const dsql_str* string;
const dsql_nod* alias; const dsql_nod* alias;
@ -2157,28 +2157,10 @@ static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
field = (dsql_fld*) item->nod_arg[e_fld_field]; field = (dsql_fld*) item->nod_arg[e_fld_field];
name_alias = field->fld_name; name_alias = field->fld_name;
context = (dsql_ctx*) item->nod_arg[e_fld_context]; context = (dsql_ctx*) item->nod_arg[e_fld_context];
if (context->ctx_relation) {
parameter->par_rel_name = context->ctx_relation->rel_name;
parameter->par_owner_name = context->ctx_relation->rel_owner;
}
else if (context->ctx_procedure) {
parameter->par_rel_name = context->ctx_procedure->prc_name;
parameter->par_owner_name = context->ctx_procedure->prc_owner;
}
parameter->par_rel_alias = context->ctx_alias;
break; break;
case nod_dbkey: case nod_dbkey:
parameter->par_name = parameter->par_alias = db_key_name; parameter->par_name = parameter->par_alias = db_key_name;
context = (dsql_ctx*) item->nod_arg[0]->nod_arg[0]; context = (dsql_ctx*) item->nod_arg[0]->nod_arg[0];
if (context->ctx_relation) {
parameter->par_rel_name = context->ctx_relation->rel_name;
parameter->par_owner_name = context->ctx_relation->rel_owner;
}
else if (context->ctx_procedure) {
parameter->par_rel_name = context->ctx_procedure->prc_name;
parameter->par_owner_name = context->ctx_procedure->prc_owner;
}
parameter->par_rel_alias = context->ctx_alias;
break; break;
case nod_alias: case nod_alias:
string = (dsql_str*) item->nod_arg[e_alias_alias]; string = (dsql_str*) item->nod_arg[e_alias_alias];
@ -2188,25 +2170,10 @@ static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
field = (dsql_fld*) alias->nod_arg[e_fld_field]; field = (dsql_fld*) alias->nod_arg[e_fld_field];
parameter->par_name = field->fld_name; parameter->par_name = field->fld_name;
context = (dsql_ctx*) alias->nod_arg[e_fld_context]; context = (dsql_ctx*) alias->nod_arg[e_fld_context];
if (context->ctx_relation) {
parameter->par_rel_name = context->ctx_relation->rel_name;
parameter->par_owner_name =
context->ctx_relation->rel_owner;
}
else if (context->ctx_procedure) {
parameter->par_rel_name =
context->ctx_procedure->prc_name;
parameter->par_owner_name =
context->ctx_procedure->prc_owner;
}
parameter->par_rel_alias = context->ctx_alias;
} }
else if (alias->nod_type == nod_dbkey) { else if (alias->nod_type == nod_dbkey) {
parameter->par_name = db_key_name; parameter->par_name = db_key_name;
context = (dsql_ctx*) alias->nod_arg[0]->nod_arg[0]; context = (dsql_ctx*) alias->nod_arg[0]->nod_arg[0];
parameter->par_rel_name = context->ctx_relation->rel_name;
parameter->par_owner_name = context->ctx_relation->rel_owner;
parameter->par_rel_alias = context->ctx_alias;
} }
break; break;
case nod_derived_field: case nod_derived_field:
@ -2217,25 +2184,10 @@ static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
field = (dsql_fld*) alias->nod_arg[e_fld_field]; field = (dsql_fld*) alias->nod_arg[e_fld_field];
parameter->par_name = field->fld_name; parameter->par_name = field->fld_name;
context = (dsql_ctx*) alias->nod_arg[e_fld_context]; context = (dsql_ctx*) alias->nod_arg[e_fld_context];
if (context->ctx_relation) {
parameter->par_rel_name = context->ctx_relation->rel_name;
parameter->par_owner_name =
context->ctx_relation->rel_owner;
}
else if (context->ctx_procedure) {
parameter->par_rel_name =
context->ctx_procedure->prc_name;
parameter->par_owner_name =
context->ctx_procedure->prc_owner;
}
parameter->par_rel_alias = context->ctx_alias;
} }
else if (alias->nod_type == nod_dbkey) { else if (alias->nod_type == nod_dbkey) {
parameter->par_name = db_key_name; parameter->par_name = db_key_name;
context = (dsql_ctx*) alias->nod_arg[0]->nod_arg[0]; context = (dsql_ctx*) alias->nod_arg[0]->nod_arg[0];
parameter->par_rel_name = context->ctx_relation->rel_name;
parameter->par_owner_name = context->ctx_relation->rel_owner;
parameter->par_rel_alias = context->ctx_alias;
} }
break; break;
case nod_map: case nod_map:
@ -2251,6 +2203,7 @@ static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
case nod_field: case nod_field:
field = (dsql_fld*) map_node->nod_arg[e_fld_field]; field = (dsql_fld*) map_node->nod_arg[e_fld_field];
name_alias = field->fld_name; name_alias = field->fld_name;
context = (dsql_ctx*) map_node->nod_arg[e_fld_context];
break; break;
case nod_alias: case nod_alias:
string = (dsql_str*) map_node->nod_arg[e_alias_alias]; string = (dsql_str*) map_node->nod_arg[e_alias_alias];
@ -2259,6 +2212,7 @@ static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
if (alias->nod_type == nod_field) { if (alias->nod_type == nod_field) {
field = (dsql_fld*) alias->nod_arg[e_fld_field]; field = (dsql_fld*) alias->nod_arg[e_fld_field];
parameter->par_name = field->fld_name; parameter->par_name = field->fld_name;
context = (dsql_ctx*) alias->nod_arg[e_fld_context];
} }
break; break;
case nod_derived_field: case nod_derived_field:
@ -2268,6 +2222,7 @@ static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
if (alias->nod_type == nod_field) { if (alias->nod_type == nod_field) {
field = (dsql_fld*) alias->nod_arg[e_fld_field]; field = (dsql_fld*) alias->nod_arg[e_fld_field];
parameter->par_name = field->fld_name; parameter->par_name = field->fld_name;
context = (dsql_ctx*) alias->nod_arg[e_fld_context];
} }
break; break;
@ -2401,4 +2356,20 @@ static void make_parameter_names(dsql_par* parameter, const dsql_nod* item)
if (name_alias) { if (name_alias) {
parameter->par_name = parameter->par_alias = name_alias; parameter->par_name = parameter->par_alias = name_alias;
} }
if (context)
{
if (context->ctx_relation)
{
parameter->par_rel_name = context->ctx_relation->rel_name;
parameter->par_owner_name = context->ctx_relation->rel_owner;
}
else if (context->ctx_procedure)
{
parameter->par_rel_name = context->ctx_procedure->prc_name;
parameter->par_owner_name = context->ctx_procedure->prc_owner;
}
parameter->par_rel_alias = context->ctx_alias;
}
} }