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

Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel

Browse Source
This commit is contained in:
asfernandes 2006-09-13 12:59:53 +00:00
parent 791cc31174
commit f47711602e
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/dsql/pass1.cpp
View File

@ -1106,17 +1106,18 @@ dsql_nod* PASS1_node(dsql_req* request, dsql_nod* input, bool proc_flag)
sub1 = node->nod_arg[0]; sub1 = node->nod_arg[0];
sub2 = node->nod_arg[1]; sub2 = node->nod_arg[1];
/* Try to force sub1 to be same type as sub2 eg: ? = FIELD case */ // Try to force sub1 to be same type as sub2 eg: ? = FIELD case
if (!set_parameter_type(request, sub1, sub2, false)) set_parameter_type(request, sub1, sub2, false);
{
/* That didn't work - try to force sub2 same type as sub 1 eg: FIELD = ? case */
set_parameter_type(request, sub2, sub1, false);
}
/* X BETWEEN Y AND ? case */ // Try to force sub2 to be same type as sub1 eg: FIELD = ? case
// Try even when the above call succeeded, because "sub2" may
// have sub-expressions that should be resolved.
set_parameter_type(request, sub2, sub1, false);
// X BETWEEN Y AND ? case
if (!set_parameter_type(request, sub3, sub1, false)) if (!set_parameter_type(request, sub3, sub1, false))
{ {
/* ? BETWEEN Y AND ? case */ // ? BETWEEN Y AND ? case
set_parameter_type(request, sub3, sub2, false); set_parameter_type(request, sub3, sub2, false);
} }
break; break;
@ -1131,14 +1132,15 @@ dsql_nod* PASS1_node(dsql_req* request, dsql_nod* input, bool proc_flag)
sub1 = node->nod_arg[0]; sub1 = node->nod_arg[0];
sub2 = node->nod_arg[1]; sub2 = node->nod_arg[1];
/* Try to force sub1 to be same type as sub2 eg: ? LIKE FIELD case */ // Try to force sub1 to be same type as sub2 eg: ? LIKE FIELD case
if (!set_parameter_type(request, sub1, sub2, true)) set_parameter_type(request, sub1, sub2, true);
{
/* That didn't work - try to force sub2 same type as sub 1 eg: FIELD LIKE ? case */
set_parameter_type(request, sub2, sub1, true);
}
/* X LIKE Y ESCAPE ? case */ // Try to force sub2 same type as sub 1 eg: FIELD LIKE ? case
// Try even when the above call succeeded, because "sub2" may
// have sub-expressions that should be resolved.
set_parameter_type(request, sub2, sub1, true);
// X LIKE Y ESCAPE ? case
set_parameter_type(request, sub3, sub2, true); set_parameter_type(request, sub3, sub2, true);
break; break;
@ -1150,7 +1152,7 @@ dsql_nod* PASS1_node(dsql_req* request, dsql_nod* input, bool proc_flag)
sub1 = node->nod_arg[e_trim_characters]; sub1 = node->nod_arg[e_trim_characters];
sub2 = node->nod_arg[e_trim_value]; sub2 = node->nod_arg[e_trim_value];
/* Try to force sub1 to be same type as sub2 eg: TRIM(? FROM FIELD) case */ // Try to force sub1 to be same type as sub2 eg: TRIM(? FROM FIELD) case
set_parameter_type(request, sub1, sub2, false); set_parameter_type(request, sub1, sub2, false);
break; break;