"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/dsql/DdlNodes.h" between
Firebird-3.0.2.32703-0.tar.bz2 and Firebird-3.0.4.33054-0.tar.bz2

About: Firebird is a relational database offering many ANSI SQL standard features.

DdlNodes.h  (Firebird-3.0.2.32703-0.tar.bz2):DdlNodes.h  (Firebird-3.0.4.33054-0.tar.bz2)
skipping to change at line 1910 skipping to change at line 1910
protected: protected:
virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector) virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector)
{ {
statusVector << Firebird::Arg::Gds(isc_dsql_mapping_failed) << na me << statusVector << Firebird::Arg::Gds(isc_dsql_mapping_failed) << na me <<
(op == MAP_ADD ? "CREATE" : op == MAP_MOD ? (op == MAP_ADD ? "CREATE" : op == MAP_MOD ?
"ALTER" : op == MAP_RPL ? "CREATE OR ALTER" : "DROP"); "ALTER" : op == MAP_RPL ? "CREATE OR ALTER" : "DROP");
} }
void runInSecurityDb(SecDbContext* secDbContext); void runInSecurityDb(SecDbContext* secDbContext);
private: private:
void addItem(Firebird::string& ddl, const char* text); void addItem(Firebird::string& ddl, const char* text, char quote = '"');
public: public:
Firebird::MetaName name; Firebird::MetaName name;
Firebird::MetaName* plugin; Firebird::MetaName* plugin;
Firebird::MetaName* db; Firebird::MetaName* db;
Firebird::MetaName* fromType; Firebird::MetaName* fromType;
IntlString* from; IntlString* from;
Firebird::MetaName* to; Firebird::MetaName* to;
OP op; OP op;
char mode; // * - any source, P - plugin, M - mapping, S - any serve rwide plugin char mode; // * - any source, P - plugin, M - mapping, S - any serve rwide plugin
skipping to change at line 2093 skipping to change at line 2093
{ {
statusVector << statusVector <<
Firebird::Arg::Gds(isGrant ? isc_dsql_grant_failed : isc_ dsql_revoke_failed); Firebird::Arg::Gds(isGrant ? isc_dsql_grant_failed : isc_ dsql_revoke_failed);
} }
void runInSecurityDb(SecDbContext* secDbContext); void runInSecurityDb(SecDbContext* secDbContext);
private: private:
void modifyPrivileges(thread_db* tdbb, jrd_tra* transaction, SSHORT optio n, const GranteeClause* user); void modifyPrivileges(thread_db* tdbb, jrd_tra* transaction, SSHORT optio n, const GranteeClause* user);
void grantRevoke(thread_db* tdbb, jrd_tra* transaction, const GranteeClau se* object, void grantRevoke(thread_db* tdbb, jrd_tra* transaction, const GranteeClau se* object,
const GranteeClause* userNod, const char* privs, const Firebird:: MetaName& field, int options); const GranteeClause* userNod, const char* privs, const Firebird:: MetaName& field, int options);
static void checkGrantorCanGrant(thread_db* tdbb, jrd_tra* transaction, c onst char* grantor, static void checkGrantorCanGrantRelation(thread_db* tdbb, jrd_tra* transa ction, const char* grantor,
const char* privilege, const Firebird::MetaName& relationName, const char* privilege, const Firebird::MetaName& relationName,
const Firebird::MetaName& fieldName, bool topLevel); const Firebird::MetaName& fieldName, bool topLevel);
static void checkGrantorCanGrantRole(thread_db* tdbb, jrd_tra* transactio n, static void checkGrantorCanGrantRole(thread_db* tdbb, jrd_tra* transactio n,
const Firebird::MetaName& grantor, const Firebird::MetaNa me& roleName); const Firebird::MetaName& grantor, const Firebird::MetaNa me& roleName);
static void checkGrantorCanGrantDdl(thread_db* tdbb, jrd_tra* transaction , static void checkGrantorCanGrantDdl(thread_db* tdbb, jrd_tra* transaction ,
const Firebird::MetaName& grantor, const char* privilege, const Firebird::MetaName& objName); const Firebird::MetaName& grantor, const char* privilege, const Firebird::MetaName& objName);
static void checkGrantorCanGrantObject(thread_db* tdbb, jrd_tra* transact
ion, const char* grantor,
const char* privilege, const Firebird::MetaName& objName, SSHORT
objType);
static void storePrivilege(thread_db* tdbb, jrd_tra* transaction, static void storePrivilege(thread_db* tdbb, jrd_tra* transaction,
const Firebird::MetaName& object, const Firebird::MetaName& user, const Firebird::MetaName& object, const Firebird::MetaName& user,
const Firebird::MetaName& field, const TEXT* privilege, SSHORT us erType, const Firebird::MetaName& field, const TEXT* privilege, SSHORT us erType,
SSHORT objType, int option, const Firebird::MetaName& grantor); SSHORT objType, int option, const Firebird::MetaName& grantor);
static void setFieldClassName(thread_db* tdbb, jrd_tra* transaction, static void setFieldClassName(thread_db* tdbb, jrd_tra* transaction,
const Firebird::MetaName& relation, const Firebird::MetaName& fie ld); const Firebird::MetaName& relation, const Firebird::MetaName& fie ld);
// Diagnostics print helper. // Diagnostics print helper.
static const char* privilegeName(char symbol) static const char* privilegeName(char symbol)
{ {
skipping to change at line 2203 skipping to change at line 2205
protected: protected:
virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector) virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector)
{ {
statusVector << Firebird::Arg::Gds(isc_dsql_alter_database_failed ); statusVector << Firebird::Arg::Gds(isc_dsql_alter_database_failed );
} }
private: private:
static void changeBackupMode(thread_db* tdbb, jrd_tra* transaction, unsig ned clause); static void changeBackupMode(thread_db* tdbb, jrd_tra* transaction, unsig ned clause);
static void defineDifference(thread_db* tdbb, jrd_tra* transaction, const Firebird::PathName& file); static void defineDifference(thread_db* tdbb, jrd_tra* transaction, const Firebird::PathName& file);
void checkClauses(thread_db* tdbb);
public: public:
bool create; // Is the node created with a CREATE DATABASE command? bool create; // Is the node created with a CREATE DATABASE command?
SLONG createLength, linger; SLONG createLength, linger;
unsigned clauses; unsigned clauses;
Firebird::string differenceFile; Firebird::string differenceFile;
Firebird::MetaName setDefaultCharSet; Firebird::MetaName setDefaultCharSet;
Firebird::MetaName setDefaultCollation; Firebird::MetaName setDefaultCollation;
Firebird::Array<NestConst<DbFileClause> > files; Firebird::Array<NestConst<DbFileClause> > files;
Firebird::MetaName cryptPlugin; Firebird::MetaName cryptPlugin;
 End of changes. 4 change blocks. 
2 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)