Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[57249] firebird/trunk/src
|
From: <asf...@us...> - 2012-10-18 15:49:26
|
Revision: 57249
http://firebird.svn.sourceforge.net/firebird/?rev=57249&view=rev
Author: asfernandes
Date: 2012-10-18 15:49:15 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
Small cleanup on COMMENT ON constants.
Modified Paths:
--------------
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/dsql.h
firebird/trunk/src/dsql/parse.y
firebird/trunk/src/jrd/obj.h
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2012-10-16 03:29:44 UTC (rev 57248)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2012-10-18 15:49:15 UTC (rev 57249)
@@ -1086,7 +1086,7 @@
const char* addWhereClause = NULL;
Arg::StatusVector status;
- if (objType == ddl_unknown)
+ if (objType == obj_parameter)
{
fb_assert(subName.hasData());
@@ -1118,11 +1118,11 @@
switch (result)
{
case 1:
- objType = ddl_procedure;
+ objType = obj_procedure;
break;
case 2:
- objType = ddl_udf;
+ objType = obj_udf;
break;
default:
@@ -1138,17 +1138,17 @@
switch (objType)
{
- case ddl_database:
+ case obj_database:
tableClause = "rdb$database";
break;
- case ddl_domain:
+ case obj_field:
tableClause = "rdb$fields";
columnClause = "rdb$field_name";
status << Arg::Gds(isc_dyn_domain_not_found);
break;
- case ddl_relation:
+ case obj_relation:
if (subName.hasData())
{
tableClause = "rdb$relation_fields";
@@ -1165,14 +1165,14 @@
columnClause = "rdb$relation_name";
break;
- case ddl_view:
+ case obj_view:
tableClause = "rdb$relations";
columnClause = "rdb$relation_name";
status << Arg::Gds(isc_dyn_view_not_found) << Arg::Str(objName);
addWhereClause = "rdb$view_blr is not null";
break;
- case ddl_procedure:
+ case obj_procedure:
if (subName.hasData())
{
tableClause = "rdb$procedure_parameters";
@@ -1190,13 +1190,13 @@
columnClause = "rdb$procedure_name";
break;
- case ddl_trigger:
+ case obj_trigger:
tableClause = "rdb$triggers";
columnClause = "rdb$trigger_name";
status << Arg::Gds(isc_dyn_trig_not_found) << Arg::Str(objName);
break;
- case ddl_udf:
+ case obj_udf:
if (subName.hasData())
{
tableClause = "rdb$function_arguments";
@@ -1214,55 +1214,55 @@
columnClause = "rdb$function_name";
break;
- case ddl_blob_filter:
+ case obj_blob_filter:
tableClause = "rdb$filters";
columnClause = "rdb$function_name";
status << Arg::Gds(isc_dyn_filter_not_found) << Arg::Str(objName);
break;
- case ddl_exception:
+ case obj_exception:
tableClause = "rdb$exceptions";
columnClause = "rdb$exception_name";
status << Arg::Gds(isc_dyn_exception_not_found) << Arg::Str(objName);
break;
- case ddl_generator:
+ case obj_generator:
tableClause = "rdb$generators";
columnClause = "rdb$generator_name";
status << Arg::Gds(isc_dyn_gen_not_found) << Arg::Str(objName);
break;
- case ddl_index:
+ case obj_index:
tableClause = "rdb$indices";
columnClause = "rdb$index_name";
status << Arg::Gds(isc_dyn_index_not_found) << Arg::Str(objName);
break;
- case ddl_role:
+ case obj_sql_role:
tableClause = "rdb$roles";
columnClause = "rdb$role_name";
status << Arg::Gds(isc_dyn_role_not_found) << Arg::Str(objName);
break;
- case ddl_charset:
+ case obj_charset:
tableClause = "rdb$character_sets";
columnClause = "rdb$character_set_name";
status << Arg::Gds(isc_dyn_charset_not_found) << Arg::Str(objName);
break;
- case ddl_collation:
+ case obj_collation:
tableClause = "rdb$collations";
columnClause = "rdb$collation_name";
status << Arg::Gds(isc_dyn_collation_not_found) << Arg::Str(objName);
break;
- case ddl_package:
+ case obj_package_header:
tableClause = "rdb$packages";
columnClause = "rdb$package_name";
status << Arg::Gds(isc_dyn_package_not_found) << Arg::Str(objName);
break;
- case ddl_schema:
+ case obj_schema:
tableClause = "rdb$schemas";
columnClause = "rdb$schema_name";
status << Arg::Gds(isc_dyn_schema_not_found) << Arg::Str(objName);
Modified: firebird/trunk/src/dsql/dsql.h
===================================================================
--- firebird/trunk/src/dsql/dsql.h 2012-10-16 03:29:44 UTC (rev 57248)
+++ firebird/trunk/src/dsql/dsql.h 2012-10-18 15:49:15 UTC (rev 57249)
@@ -828,16 +828,6 @@
bool par_is_text; // Parameter should be dtype_text (SQL_TEXT) externaly
};
-// CVC: Enumeration used for the COMMENT command.
-enum
-{
- ddl_unknown,
- ddl_database, ddl_domain, ddl_relation, ddl_view, ddl_procedure, ddl_trigger,
- ddl_udf, ddl_blob_filter, ddl_exception, ddl_generator, ddl_index, ddl_role,
- ddl_charset, ddl_collation, ddl_package, ddl_schema,
- //, ddl_sec_class
-};
-
class CStrCmp
{
public:
Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y 2012-10-16 03:29:44 UTC (rev 57248)
+++ firebird/trunk/src/dsql/parse.y 2012-10-18 15:49:15 UTC (rev 57249)
@@ -4343,27 +4343,27 @@
%type <intVal> ddl_type0
ddl_type0
: DATABASE
- { $$ = ddl_database; }
+ { $$ = obj_database; }
;
%type <intVal> ddl_type1
ddl_type1
- : DOMAIN { $$ = ddl_domain; }
- | TABLE { $$ = ddl_relation; }
- | VIEW { $$ = ddl_view; }
- | PROCEDURE { $$ = ddl_procedure; }
- | TRIGGER { $$ = ddl_trigger; }
- | EXTERNAL FUNCTION { $$ = ddl_udf; }
- | FUNCTION { $$ = ddl_udf; }
- | FILTER { $$ = ddl_blob_filter; }
- | EXCEPTION { $$ = ddl_exception; }
- | GENERATOR { $$ = ddl_generator; }
- | SEQUENCE { $$ = ddl_generator; }
- | INDEX { $$ = ddl_index; }
- | ROLE { $$ = ddl_role; }
- | CHARACTER SET { $$ = ddl_charset; }
- | COLLATION { $$ = ddl_collation; }
- | PACKAGE { $$ = ddl_package; }
+ : DOMAIN { $$ = obj_field; }
+ | TABLE { $$ = obj_relation; }
+ | VIEW { $$ = obj_view; }
+ | PROCEDURE { $$ = obj_procedure; }
+ | TRIGGER { $$ = obj_trigger; }
+ | EXTERNAL FUNCTION { $$ = obj_udf; }
+ | FUNCTION { $$ = obj_udf; }
+ | FILTER { $$ = obj_blob_filter; }
+ | EXCEPTION { $$ = obj_exception; }
+ | GENERATOR { $$ = obj_generator; }
+ | SEQUENCE { $$ = obj_generator; }
+ | INDEX { $$ = obj_index; }
+ | ROLE { $$ = obj_sql_role; }
+ | CHARACTER SET { $$ = obj_charset; }
+ | COLLATION { $$ = obj_collation; }
+ | PACKAGE { $$ = obj_package_header; }
/***
| SECURITY CLASS { $$ = ddl_sec_class; }
***/
@@ -4371,15 +4371,15 @@
%type <intVal> ddl_type2
ddl_type2
- : COLUMN { $$ = ddl_relation; }
+ : COLUMN { $$ = obj_relation; }
| ddl_param_opt PARAMETER { $$ = $1; }
;
%type <intVal> ddl_param_opt
ddl_param_opt
- : { $$ = ddl_unknown; }
- | PROCEDURE { $$ = ddl_procedure; }
- | FUNCTION { $$ = ddl_udf; }
+ : { $$ = obj_parameter; }
+ | PROCEDURE { $$ = obj_procedure; }
+ | FUNCTION { $$ = obj_udf; }
;
%type <legacyStr> ddl_subname
Modified: firebird/trunk/src/jrd/obj.h
===================================================================
--- firebird/trunk/src/jrd/obj.h 2012-10-16 03:29:44 UTC (rev 57248)
+++ firebird/trunk/src/jrd/obj.h 2012-10-18 15:49:15 UTC (rev 57249)
@@ -49,6 +49,11 @@
const int obj_package_body = 19;
const int obj_type_MAX = 20; // keep this last!
-const int obj_user_or_role = 20; // used in the parser only / no relation with obj_type_MAX
+// used in the parser only / no relation with obj_type_MAX
+const int obj_user_or_role = 20;
+const int obj_database = 21;
+const int obj_schema = 22;
+const int obj_parameter = 23;
+
#endif // JRD_OBJ_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
