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

Moved DEFAULT_CLASS to constants.h;

Browse Source 
a Buil | Clean Solution + F7 may be needed in VC (otherwise linker errors appear).
This commit is contained in:
robocop 2009-06-26 11:18:45 +00:00
parent 9c71438257
commit 81e2c10f0d
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jrd/constants.h
View File

@ -112,11 +112,13 @@ const char* const IMPLICIT_PK_PREFIX = "RDB$PRIMARY";
const int IMPLICIT_PK_PREFIX_LEN = 11; const int IMPLICIT_PK_PREFIX_LEN = 11;
// Automatically created security classes for SQL objects. // Automatically created security classes for SQL objects.
const char* const SQL_SECCLASS_GENERATOR = "RDB$SECURITY_CLASS"; // Keep in sync with trig.h
const char* const SQL_SECCLASS_PREFIX = "SQL$"; const char* const DEFAULT_CLASS = "SQL$DEFAULT";
const int SQL_SECCLASS_PREFIX_LEN = 4; const char* const SQL_SECCLASS_GENERATOR = "RDB$SECURITY_CLASS";
const char* const SQL_FLD_SECCLASS_PREFIX = "SQL$GRANT"; const char* const SQL_SECCLASS_PREFIX = "SQL$";
const int SQL_FLD_SECCLASS_PREFIX_LEN = 9; const int SQL_SECCLASS_PREFIX_LEN = 4;
const char* const SQL_FLD_SECCLASS_PREFIX = "SQL$GRANT";
const int SQL_FLD_SECCLASS_PREFIX_LEN = 9;
// Automatically created check constraints for unnamed PRIMARY and UNIQUE declarations. // Automatically created check constraints for unnamed PRIMARY and UNIQUE declarations.
const char* const IMPLICIT_INTEGRITY_PREFIX = "INTEG_"; const char* const IMPLICIT_INTEGRITY_PREFIX = "INTEG_";

6
src/jrd/grant.epp
View File

@ -54,15 +54,15 @@
#include "../jrd/scl_proto.h" #include "../jrd/scl_proto.h"
#include "../common/utils_proto.h" #include "../common/utils_proto.h"
#include "../common/classes/array.h" #include "../common/classes/array.h"
#include "../jrd/constants.h"
using namespace Jrd; using namespace Jrd;
/* privileges given to the owner of a relation */ /* privileges given to the owner of a relation */
const SecurityClass::flags_t OWNER_PRIVS = SCL_control | SCL_read | SCL_write | SCL_delete | SCL_protect; const SecurityClass::flags_t OWNER_PRIVS = SCL_control | SCL_read | SCL_write | SCL_delete | SCL_protect;
const SecurityClass::flags_t VIEW_PRIVS = SCL_read | SCL_write | SCL_delete; //const SecurityClass::flags_t VIEW_PRIVS = SCL_read | SCL_write | SCL_delete;
const ULONG ACL_BUFFER_SIZE = 4096; //const ULONG ACL_BUFFER_SIZE = 4096;
static const char* DEFAULT_CLASS = "SQL$DEFAULT";
inline void CHECK_AND_MOVE(Acl& to, UCHAR from) inline void CHECK_AND_MOVE(Acl& to, UCHAR from)
{ {

4
src/jrd/ini.epp
View File

@ -55,6 +55,8 @@
#include "../jrd/acl.h" #include "../jrd/acl.h"
#include "../jrd/irq.h" #include "../jrd/irq.h"
#include "../jrd/IntlManager.h" #include "../jrd/IntlManager.h"
#include "../jrd/constants.h"
using namespace Jrd; using namespace Jrd;
@ -62,7 +64,7 @@ DATABASE DB = FILENAME "ODS.RDB";
#define PAD(string, field) jrd_vtof ((char*)(string), field, sizeof (field)) #define PAD(string, field) jrd_vtof ((char*)(string), field, sizeof (field))
const int FB_MAX_ACL_SIZE = 4096; const int FB_MAX_ACL_SIZE = 4096;
const char* DEFAULT_CLASS = "SQL$DEFAULT";
static void add_index_set(Database*, bool, USHORT, USHORT); static void add_index_set(Database*, bool, USHORT, USHORT);
static void add_relation_fields(thread_db*, USHORT); static void add_relation_fields(thread_db*, USHORT);

2
src/jrd/trig.h
View File

@ -66,7 +66,7 @@ struct gen
} //namespace Jrd } //namespace Jrd
/* generators needed by the system triggers */ /* generators needed by the system triggers */
// Keep in sync with constants.h
static const Jrd::gen generators[] = static const Jrd::gen generators[] =
{ {
{ "RDB$SECURITY_CLASS", 1, NULL }, { "RDB$SECURITY_CLASS", 1, NULL },