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

Misc.

Browse Source
This commit is contained in:
asfernandes 2014-04-11 02:06:08 +00:00
parent 748d0eae96
commit 29602be60f
4 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dsql/DdlNodes.epp
View File

@ -9240,7 +9240,7 @@ void MappingNode::validateAdmin()
Arg::Gds(isc_alter_role).raise();
}
// add some item to DLL in "double quotes"
// add some item to DDL in "double quotes"
void MappingNode::addItem(string& ddl, const char* text)
{
ddl += '"';
@ -9482,7 +9482,7 @@ void MappingNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd
Check::status(s);
}
}
catch(const Exception&)
catch (const Exception&)
{
if (savePoint.hasData())
{
@ -9494,10 +9494,9 @@ void MappingNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd
{
const ISC_STATUS* stat2 = s2.get();
if (stat2[1] != isc_dsql_token_unk_err)
{
status_exception::raise(stat2);
}
}
throw;
}
@ -9622,9 +9621,7 @@ void MappingNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd
case MAP_MOD:
case MAP_DROP:
if (!found)
{
(Arg::Gds(isc_map_not_exists) << name).raise();
}
break;
}

4
src/dsql/ExprNodes.cpp
View File

@ -5787,6 +5787,7 @@ dsc* GenIdNode::execute(thread_db* tdbb, jrd_req* request) const
impure_value* const impure = request->getImpure<impure_value>(impureOffset);
SINT64 change = step;
if (!implicit)
{
const dsc* const value = EVL_expr(tdbb, request, arg);
@ -5796,12 +5797,11 @@ dsc* GenIdNode::execute(thread_db* tdbb, jrd_req* request) const
change = MOV_get_int64(value, 0);
}
if (sysGen && change != 0)
{
if (!request->hasInternalStatement() && !tdbb->getAttachment()->isRWGbak())
{
status_exception::raise(Arg::Gds(isc_cant_modify_sysobj) << "generator" << generator.name);
}
}
const SINT64 new_val = DPM_gen_id(tdbb, generator.id, false, change);

1
src/dsql/ExprNodes.h
View File

@ -679,6 +679,7 @@ public:
const bool dialect1;
GeneratorItem generator;
NestConst<ValueExprNode> arg;
private:
SLONG step;
bool sysGen;

89
src/dsql/parse.y
View File

@ -1495,7 +1495,7 @@ start_with
%type <nullableInt32Val> step_option
step_option
: /* nothing */ { $$ = Nullable<SLONG>::empty(); }
: /* nothing */ { $$ = Nullable<SLONG>::empty(); }
| INCREMENT by_noise signed_long_integer { $$ = Nullable<SLONG>::val($3); }
by_noise
@ -3697,7 +3697,7 @@ alter_role_clause
: symbol_role_name alter_role_enable AUTO ADMIN MAPPING
{
$$ = newNode<MappingNode>(MappingNode::MAP_RPL, "AutoAdminImplementationMapping");
$$->op = $2 ? MappingNode::MAP_RPL : MappingNode::MAP_DROP;
$$->op = $2 ? MappingNode::MAP_RPL : MappingNode::MAP_DROP;
$$->from = newNode<IntlString>(FB_DOMAIN_ANY_RID_ADMINS);
$$->fromType = newNode<MetaName>(FB_PREDEFINED_GROUP);
$$->mode = 'P';
@ -5974,39 +5974,39 @@ user_var_option($node)
%type <mappingNode> create_map_clause(<boolVal>)
create_map_clause($global)
: map_clause(MappingNode::MAP_ADD)
{
$$ = $1;
$$->global = $global;
}
map_to(NOTRIAL($2))
{
$$ = $2;
}
{
$$ = $1;
$$->global = $global;
}
map_to(NOTRIAL($2))
{
$$ = $2;
}
;
%type <mappingNode> alter_map_clause(<boolVal>)
alter_map_clause($global)
: map_clause(MappingNode::MAP_MOD)
{
$$ = $1;
}
map_to(NOTRIAL($2))
{
$$ = $2;
}
{
$$ = $1;
}
map_to(NOTRIAL($2))
{
$$ = $2;
}
;
%type <mappingNode> replace_map_clause(<boolVal>)
replace_map_clause($global)
: map_clause(MappingNode::MAP_RPL)
{
$$ = $1;
$$->global = $global;
}
map_to(NOTRIAL($2))
{
$$ = $2;
}
{
$$ = $1;
$$->global = $global;
}
map_to(NOTRIAL($2))
{
$$ = $2;
}
;
%type <mappingNode> drop_map_clause(<boolVal>)
@ -6022,14 +6022,14 @@ drop_map_clause($global)
%type <mappingNode> map_clause(<mappingOp>)
map_clause($op)
: map_name
{
$$ = newNode<MappingNode>($op, *$1);
}
USING map_using(NOTRIAL($2))
FROM map_from(NOTRIAL($2))
{
$$ = $2;
}
{
$$ = newNode<MappingNode>($op, *$1);
}
USING map_using(NOTRIAL($2))
FROM map_from(NOTRIAL($2))
{
$$ = $2;
}
;
%type <metaNamePtr> map_name
@ -6055,17 +6055,14 @@ map_from($node)
%type <metaNamePtr> map_from_symbol_name
map_from_symbol_name
: valid_symbol_name
| USER
{ $$ = newNode<MetaName>("USER"); }
| GROUP
{ $$ = newNode<MetaName>("GROUP"); }
| USER { $$ = newNode<MetaName>("USER"); }
| GROUP { $$ = newNode<MetaName>("GROUP"); }
;
%type <intlStringPtr> map_logoninfo
map_logoninfo
: STRING
| valid_symbol_name
{ $$ = newNode<IntlString>($1->c_str()); }
| valid_symbol_name { $$ = newNode<IntlString>($1->c_str()); }
;
%type map_using(<mappingNode>)
@ -6099,10 +6096,8 @@ map_using($node)
%type <metaNamePtr> map_in
map_in
: // nothing
{ $$ = NULL; }
| KW_IN valid_symbol_name
{ $$ = $2; }
: /* nothing */ { $$ = NULL; }
| KW_IN valid_symbol_name { $$ = $2; }
;
%type map_to(<mappingNode>)
@ -6120,10 +6115,8 @@ map_to($node)
%type <boolVal> map_role
map_role
: ROLE
{ $$ = true; }
| USER
{ $$ = false; }
: ROLE { $$ = true; }
| USER { $$ = false; }
;
@ -6955,7 +6948,7 @@ next_value_expression
: NEXT KW_VALUE FOR symbol_generator_name
{
$$ = newNode<GenIdNode>((client_dialect < SQL_DIALECT_V6_TRANSITION),
*$4, ((Jrd::ValueExprNode*)0), true);
*$4, ((Jrd::ValueExprNode*) NULL), true);
}
| GEN_ID '(' symbol_generator_name ',' value ')'
{ $$ = newNode<GenIdNode>((client_dialect < SQL_DIALECT_V6_TRANSITION), *$3, $5, false); }