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

Change type of user flags from int to bool.

Browse Source
This commit is contained in:
asfernandes 2014-01-06 00:57:10 +00:00
parent 0ec5daac05
commit f85f43ae9c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dsql/DdlNodes.epp
View File

@ -9280,7 +9280,7 @@ void CreateAlterUserNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScra
if (active.specified) if (active.specified)
{ {
userData->act.set(active.value); userData->act.set((int) active.value);
userData->act.setEntered(1); userData->act.setEntered(1);
} }

4
src/dsql/DdlNodes.h
View File

@ -1846,8 +1846,8 @@ public:
Firebird::string* middleName; Firebird::string* middleName;
Firebird::string* lastName; Firebird::string* lastName;
Firebird::string* comment; Firebird::string* comment;
Nullable<int> adminRole; Nullable<bool> adminRole;
Nullable<int> active; Nullable<bool> active;
Mode mode; Mode mode;
void addProperty(Firebird::MetaName* pr, Firebird::string* val = NULL) void addProperty(Firebird::MetaName* pr, Firebird::string* val = NULL)

8
src/dsql/parse.y
View File

@ -5889,10 +5889,10 @@ user_fixed_opt($node)
: FIRSTNAME utf_string { setClause($node->firstName, "FIRSTNAME", $2); } : FIRSTNAME utf_string { setClause($node->firstName, "FIRSTNAME", $2); }
| MIDDLENAME utf_string { setClause($node->middleName, "MIDDLENAME", $2); } | MIDDLENAME utf_string { setClause($node->middleName, "MIDDLENAME", $2); }
| LASTNAME utf_string { setClause($node->lastName, "LASTNAME", $2); } | LASTNAME utf_string { setClause($node->lastName, "LASTNAME", $2); }
| GRANT ADMIN ROLE { setClause($node->adminRole, "ADMIN ROLE", Nullable<int>(1)); } | GRANT ADMIN ROLE { setClause($node->adminRole, "ADMIN ROLE", Nullable<bool>(true)); }
| REVOKE ADMIN ROLE { setClause($node->adminRole, "ADMIN ROLE", Nullable<int>(0)); } | REVOKE ADMIN ROLE { setClause($node->adminRole, "ADMIN ROLE", Nullable<bool>(false)); }
| ACTIVE { setClause($node->active, "ACTIVE/INACTIVE", Nullable<int>(1)); } | ACTIVE { setClause($node->active, "ACTIVE/INACTIVE", Nullable<bool>(true)); }
| INACTIVE { setClause($node->active, "ACTIVE/INACTIVE", Nullable<int>(0)); } | INACTIVE { setClause($node->active, "ACTIVE/INACTIVE", Nullable<bool>(false)); }
; ;
%type user_var_opts(<createAlterUserNode>) %type user_var_opts(<createAlterUserNode>)