Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[51396] firebird/trunk/src/dsql
|
From: <asf...@us...> - 2010-08-05 00:47:12
|
Revision: 51396
http://firebird.svn.sourceforge.net/firebird/?rev=51396&view=rev
Author: asfernandes
Date: 2010-08-05 00:47:06 +0000 (Thu, 05 Aug 2010)
Log Message:
-----------
Simplification
Modified Paths:
--------------
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DdlNodes.h
firebird/trunk/src/dsql/Nodes.h
firebird/trunk/src/dsql/PackageNodes.epp
firebird/trunk/src/dsql/PackageNodes.h
firebird/trunk/src/dsql/parse.y
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2010-08-05 00:44:58 UTC (rev 51395)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2010-08-05 00:47:06 UTC (rev 51396)
@@ -612,7 +612,8 @@
void DdlNode::executeDdlTrigger(thread_db* tdbb, jrd_tra* transaction,
DdlNode::DdlTriggerWhen when, int action, const MetaName& objectName)
{
- executeDdlTrigger(tdbb, transaction, when, action, objectName, sqlText);
+ executeDdlTrigger(tdbb, transaction, when, action, objectName,
+ *dsqlScratch->getStatement()->getSqlText());
}
void DdlNode::putType(const TypeClause& type, bool useSubType)
@@ -6923,10 +6924,43 @@
END_FOR
}
-// Remove records from a relation.
-void DropRelationNode::erase(thread_db* tdbb, jrd_tra* transaction, const MetaName& name,
- bool view, const string& sqlText)
+void DropRelationNode::print(string& text, Array<dsql_nod*>& /*nodes*/) const
{
+ text.printf(
+ "DropRelationNode\n"
+ " name: '%s'\n",
+ name.c_str());
+}
+
+void DropRelationNode::execute(thread_db* tdbb, jrd_tra* transaction)
+{
+ const dsql_rel* relation = METD_get_relation(transaction, dsqlScratch, name);
+
+ if (!relation && silent)
+ return;
+
+ // Check that DROP TABLE is dropping a table and that DROP VIEW is dropping a view.
+ if (view)
+ {
+ if (!relation || (relation && !(relation->rel_flags & REL_view)))
+ {
+ status_exception::raise(
+ Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
+ Arg::Gds(isc_dsql_command_err) <<
+ Arg::Gds(isc_dsql_view_not_found) << name);
+ }
+ }
+ else
+ {
+ if (!relation || (relation && (relation->rel_flags & REL_view)))
+ {
+ status_exception::raise(
+ Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
+ Arg::Gds(isc_dsql_command_err) <<
+ Arg::Gds(isc_dsql_table_not_found) << name);
+ }
+ }
+
const int ddlTriggerAction = (view ? DDL_TRIGGER_DROP_VIEW : DDL_TRIGGER_DROP_TABLE);
// run all statements under savepoint control
@@ -6939,7 +6973,7 @@
R IN RDB$RELATIONS
WITH R.RDB$RELATION_NAME EQ name.c_str()
{
- executeDdlTrigger(tdbb, transaction, DTW_BEFORE, ddlTriggerAction, name, sqlText);
+ executeDdlTrigger(tdbb, transaction, DTW_BEFORE, ddlTriggerAction, name);
found = true;
}
END_FOR
@@ -7096,7 +7130,7 @@
END_FOR
if (found)
- executeDdlTrigger(tdbb, transaction, DTW_AFTER, ddlTriggerAction, name, sqlText);
+ executeDdlTrigger(tdbb, transaction, DTW_AFTER, ddlTriggerAction, name);
else
{
// msg 61: "Relation not found"
@@ -7104,47 +7138,7 @@
}
savePoint.release(); // everything is ok
-}
-void DropRelationNode::print(string& text, Array<dsql_nod*>& /*nodes*/) const
-{
- text.printf(
- "DropRelationNode\n"
- " name: '%s'\n",
- name.c_str());
-}
-
-void DropRelationNode::execute(thread_db* tdbb, jrd_tra* transaction)
-{
- const dsql_rel* relation = METD_get_relation(transaction, dsqlScratch, name);
-
- if (!relation && silent)
- return;
-
- // Check that DROP TABLE is dropping a table and that DROP VIEW is dropping a view.
- if (view)
- {
- if (!relation || (relation && !(relation->rel_flags & REL_view)))
- {
- status_exception::raise(
- Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
- Arg::Gds(isc_dsql_command_err) <<
- Arg::Gds(isc_dsql_view_not_found) << name);
- }
- }
- else
- {
- if (!relation || (relation && (relation->rel_flags & REL_view)))
- {
- status_exception::raise(
- Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
- Arg::Gds(isc_dsql_command_err) <<
- Arg::Gds(isc_dsql_table_not_found) << name);
- }
- }
-
- erase(tdbb, transaction, name, view, getSqlText());
-
METD_drop_relation(transaction, name.c_str());
MET_dsql_cache_release(tdbb, SYM_relation, name);
}
Modified: firebird/trunk/src/dsql/DdlNodes.h
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.h 2010-08-05 00:44:58 UTC (rev 51395)
+++ firebird/trunk/src/dsql/DdlNodes.h 2010-08-05 00:47:06 UTC (rev 51396)
@@ -118,10 +118,10 @@
class RecreateNode : public DdlNode
{
public:
- RecreateNode(MemoryPool& p, const Firebird::string& sqlText, CreateNode* aCreateNode)
- : DdlNode(p, sqlText),
+ RecreateNode(MemoryPool& p, CreateNode* aCreateNode)
+ : DdlNode(p),
createNode(aCreateNode),
- dropNode(p, sqlText, createNode->name)
+ dropNode(p, createNode->name)
{
dropNode.silent = true;
}
@@ -165,9 +165,9 @@
class AlterCharSetNode : public DdlNode
{
public:
- AlterCharSetNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aCharSet, const Firebird::MetaName& aDefaultCollation)
- : DdlNode(pool, sqlText),
+ AlterCharSetNode(MemoryPool& pool, const Firebird::MetaName& aCharSet,
+ const Firebird::MetaName& aDefaultCollation)
+ : DdlNode(pool),
charSet(pool, aCharSet),
defaultCollation(pool, aDefaultCollation)
{
@@ -192,10 +192,10 @@
class CommentOnNode : public DdlNode
{
public:
- CommentOnNode(MemoryPool& pool, const Firebird::string& sqlText, int aObjType,
+ CommentOnNode(MemoryPool& pool, int aObjType,
const Firebird::MetaName& aObjName, const Firebird::MetaName& aSubName,
const Firebird::string& aText, const char* aTextCharSet)
- : DdlNode(pool, sqlText),
+ : DdlNode(pool),
objType(aObjType),
objName(pool, aObjName),
subName(pool, aSubName),
@@ -232,9 +232,8 @@
class CreateAlterFunctionNode : public DdlNode, public BlockNode
{
public:
- CreateAlterFunctionNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ CreateAlterFunctionNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
BlockNode(pool, false),
name(pool, aName),
create(true),
@@ -300,9 +299,8 @@
class DropFunctionNode : public DdlNode
{
public:
- DropFunctionNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ DropFunctionNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
name(pool, aName),
silent(false),
package(pool)
@@ -339,9 +337,8 @@
class CreateAlterProcedureNode : public DdlNode, public BlockNode
{
public:
- CreateAlterProcedureNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ CreateAlterProcedureNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
BlockNode(pool, true),
name(pool, aName),
create(true),
@@ -404,9 +401,8 @@
class DropProcedureNode : public DdlNode
{
public:
- DropProcedureNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ DropProcedureNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
name(pool, aName),
silent(false),
package(pool)
@@ -483,9 +479,8 @@
class CreateAlterTriggerNode : public DdlNode, public BlockNode, public TriggerDefinition
{
public:
- CreateAlterTriggerNode(MemoryPool& p, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(p, sqlText),
+ CreateAlterTriggerNode(MemoryPool& p, const Firebird::MetaName& aName)
+ : DdlNode(p),
BlockNode(p, false),
TriggerDefinition(p),
create(true),
@@ -559,8 +554,8 @@
class DropTriggerNode : public DdlNode
{
public:
- DropTriggerNode(MemoryPool& p, const Firebird::string& sqlText, const Firebird::MetaName& aName)
- : DdlNode(p, sqlText),
+ DropTriggerNode(MemoryPool& p, const Firebird::MetaName& aName)
+ : DdlNode(p),
name(p, aName),
silent(false)
{
@@ -591,9 +586,9 @@
class CreateCollationNode : public DdlNode
{
public:
- CreateCollationNode(MemoryPool& p, const Firebird::string& sqlText,
- const Firebird::MetaName& aName, const Firebird::MetaName& aForCharSet)
- : DdlNode(p, sqlText),
+ CreateCollationNode(MemoryPool& p, const Firebird::MetaName& aName,
+ const Firebird::MetaName& aForCharSet)
+ : DdlNode(p),
name(p, aName),
forCharSet(p, aForCharSet),
fromName(p),
@@ -662,9 +657,8 @@
class DropCollationNode : public DdlNode
{
public:
- DropCollationNode(MemoryPool& p, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(p, sqlText),
+ DropCollationNode(MemoryPool& p, const Firebird::MetaName& aName)
+ : DdlNode(p),
name(p, aName)
{
}
@@ -687,9 +681,8 @@
class CreateDomainNode : public DdlNode
{
public:
- CreateDomainNode(MemoryPool& p, const Firebird::string& sqlText,
- const ParameterClause& aNameType)
- : DdlNode(p, sqlText),
+ CreateDomainNode(MemoryPool& p, const ParameterClause& aNameType)
+ : DdlNode(p),
nameType(aNameType),
notNull(false),
check(NULL)
@@ -716,8 +709,8 @@
class AlterDomainNode : public DdlNode
{
public:
- AlterDomainNode(MemoryPool& p, const Firebird::string& sqlText, const Firebird::MetaName& aName)
- : DdlNode(p, sqlText),
+ AlterDomainNode(MemoryPool& p, const Firebird::MetaName& aName)
+ : DdlNode(p),
name(p, aName),
dropConstraint(false),
dropDefault(false),
@@ -762,8 +755,8 @@
class DropDomainNode : public DdlNode
{
public:
- DropDomainNode(MemoryPool& p, const Firebird::string& sqlText, const Firebird::MetaName& aName)
- : DdlNode(p, sqlText),
+ DropDomainNode(MemoryPool& p, const Firebird::MetaName& aName)
+ : DdlNode(p),
name(p, aName)
{
}
@@ -792,9 +785,9 @@
class CreateAlterExceptionNode : public DdlNode
{
public:
- CreateAlterExceptionNode(MemoryPool& p, const Firebird::string& sqlText,
- const Firebird::MetaName& aName, const Firebird::string& aMessage)
- : DdlNode(p, sqlText),
+ CreateAlterExceptionNode(MemoryPool& p, const Firebird::MetaName& aName,
+ const Firebird::string& aMessage)
+ : DdlNode(p),
name(p, aName),
message(p, aMessage),
create(true),
@@ -831,9 +824,8 @@
class DropExceptionNode : public DdlNode
{
public:
- DropExceptionNode(MemoryPool& p, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(p, sqlText),
+ DropExceptionNode(MemoryPool& p, const Firebird::MetaName& aName)
+ : DdlNode(p),
name(p, aName),
silent(false)
{
@@ -862,9 +854,8 @@
class CreateSequenceNode : public DdlNode
{
public:
- CreateSequenceNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ CreateSequenceNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
name(pool, aName)
{
}
@@ -994,8 +985,8 @@
Firebird::ObjectsArray<BlrWriter> blrWritersHolder;
};
- RelationNode(MemoryPool& p, const Firebird::string& sqlText, dsql_nod* aDsqlNode)
- : DdlNode(p, sqlText),
+ RelationNode(MemoryPool& p, dsql_nod* aDsqlNode)
+ : DdlNode(p),
dsqlNode(aDsqlNode),
name(p, ((dsql_str*) aDsqlNode->nod_arg[Dsql::e_rln_name])->str_data),
elements(p)
@@ -1038,9 +1029,9 @@
class CreateRelationNode : public RelationNode
{
public:
- CreateRelationNode(MemoryPool& p, const Firebird::string& sqlText,
- dsql_nod* aDsqlNode, const Firebird::PathName* aExternalFile = NULL)
- : RelationNode(p, sqlText, aDsqlNode),
+ CreateRelationNode(MemoryPool& p, dsql_nod* aDsqlNode,
+ const Firebird::PathName* aExternalFile = NULL)
+ : RelationNode(p, aDsqlNode),
externalFile(aExternalFile),
relationType(rel_persistent)
{
@@ -1068,8 +1059,8 @@
class AlterRelationNode : public RelationNode
{
public:
- AlterRelationNode(MemoryPool& p, const Firebird::string& sqlText, dsql_nod* aDsqlNode)
- : RelationNode(p, sqlText, aDsqlNode)
+ AlterRelationNode(MemoryPool& p, dsql_nod* aDsqlNode)
+ : RelationNode(p, aDsqlNode)
{
}
@@ -1091,9 +1082,8 @@
class DropRelationNode : public DdlNode
{
public:
- DropRelationNode(MemoryPool& p, const Firebird::string& sqlText,
- const Firebird::MetaName& aName, bool aView = false)
- : DdlNode(p, sqlText),
+ DropRelationNode(MemoryPool& p, const Firebird::MetaName& aName, bool aView = false)
+ : DdlNode(p),
name(p, aName),
view(aView),
silent(false)
@@ -1103,9 +1093,6 @@
static void deleteGlobalField(thread_db* tdbb, jrd_tra* transaction,
const Firebird::MetaName& globalName);
- static void erase(thread_db* tdbb, jrd_tra* transaction, const Firebird::MetaName& name,
- bool view, const Firebird::string& sqlText);
-
public:
virtual void print(Firebird::string& text, Firebird::Array<dsql_nod*>& nodes) const;
virtual void execute(thread_db* tdbb, jrd_tra* transaction);
@@ -1130,9 +1117,9 @@
class CreateAlterViewNode : public RelationNode
{
public:
- CreateAlterViewNode(MemoryPool& p, const Firebird::string& sqlText,
- dsql_nod* aDsqlNode, dsql_nod* aViewFields, dsql_nod* aSelectExpr)
- : RelationNode(p, sqlText, aDsqlNode),
+ CreateAlterViewNode(MemoryPool& p, dsql_nod* aDsqlNode, dsql_nod* aViewFields,
+ dsql_nod* aSelectExpr)
+ : RelationNode(p, aDsqlNode),
create(true),
alter(false),
viewFields(aViewFields),
@@ -1179,10 +1166,9 @@
public RecreateNode<CreateAlterViewNode, DropRelationNode, isc_dsql_recreate_view_failed>
{
public:
- RecreateViewNode(MemoryPool& p, const Firebird::string& sqlText,
- CreateAlterViewNode* aCreateNode)
+ RecreateViewNode(MemoryPool& p, CreateAlterViewNode* aCreateNode)
: RecreateNode<CreateAlterViewNode, DropRelationNode, isc_dsql_recreate_view_failed>(
- p, sqlText, aCreateNode)
+ p, aCreateNode)
{
dropNode.view = true;
}
Modified: firebird/trunk/src/dsql/Nodes.h
===================================================================
--- firebird/trunk/src/dsql/Nodes.h 2010-08-05 00:44:58 UTC (rev 51395)
+++ firebird/trunk/src/dsql/Nodes.h 2010-08-05 00:47:06 UTC (rev 51396)
@@ -91,9 +91,8 @@
class DdlNode : public Node
{
public:
- explicit DdlNode(MemoryPool& pool, const Firebird::string& aSqlText)
- : Node(pool),
- sqlText(pool, aSqlText)
+ explicit DdlNode(MemoryPool& pool)
+ : Node(pool)
{
}
@@ -101,11 +100,6 @@
const Firebird::MetaName& secClass);
public:
- const Firebird::string& getSqlText()
- {
- return sqlText;
- }
-
// Set the scratch's transaction when executing a node. Fact of accessing the scratch during
// execution is a hack.
void executeDdl(thread_db* tdbb, jrd_tra* transaction)
@@ -183,9 +177,6 @@
public:
virtual void execute(thread_db* tdbb, jrd_tra* transaction) = 0;
-
-private:
- Firebird::string sqlText;
};
Modified: firebird/trunk/src/dsql/PackageNodes.epp
===================================================================
--- firebird/trunk/src/dsql/PackageNodes.epp 2010-08-05 00:44:58 UTC (rev 51395)
+++ firebird/trunk/src/dsql/PackageNodes.epp 2010-08-05 00:47:06 UTC (rev 51396)
@@ -561,7 +561,7 @@
{
if (!functionNames.exist(i->name))
{
- DropFunctionNode dropNode(getPool(), "", i->name);
+ DropFunctionNode dropNode(getPool(), i->name);
dropNode.package = name;
dropNode.dsqlPass(dsqlScratch);
dropNode.executeDdl(tdbb, transaction);
@@ -573,7 +573,7 @@
{
if (!procedureNames.exist(i->name))
{
- DropProcedureNode dropNode(getPool(), "", i->name);
+ DropProcedureNode dropNode(getPool(), i->name);
dropNode.package = name;
dropNode.dsqlPass(dsqlScratch);
dropNode.executeDdl(tdbb, transaction);
@@ -653,7 +653,7 @@
for (SortedObjectsArray<Signature>::iterator i = existingFuncs.begin();
i != existingFuncs.end(); ++i)
{
- DropFunctionNode dropNode(getPool(), "", i->name);
+ DropFunctionNode dropNode(getPool(), i->name);
dropNode.package = name;
dropNode.dsqlPass(dsqlScratch);
dropNode.executeDdl(tdbb, transaction);
@@ -662,7 +662,7 @@
for (SortedObjectsArray<Signature>::iterator i = existingProcs.begin();
i != existingProcs.end(); ++i)
{
- DropProcedureNode dropNode(getPool(), "", i->name);
+ DropProcedureNode dropNode(getPool(), i->name);
dropNode.package = name;
dropNode.dsqlPass(dsqlScratch);
dropNode.executeDdl(tdbb, transaction);
@@ -1038,7 +1038,7 @@
{
if (!FUN.RDB$PRIVATE_FLAG.NULL && FUN.RDB$PRIVATE_FLAG != 0)
{
- DropFunctionNode dropNode(getPool(), "", FUN.RDB$FUNCTION_NAME);
+ DropFunctionNode dropNode(getPool(), FUN.RDB$FUNCTION_NAME);
dropNode.package = name;
dropNode.dsqlPass(dsqlScratch);
dropNode.executeDdl(tdbb, transaction);
@@ -1065,7 +1065,7 @@
{
if (!PRC.RDB$PRIVATE_FLAG.NULL && PRC.RDB$PRIVATE_FLAG != 0)
{
- DropProcedureNode dropNode(getPool(), "", PRC.RDB$PROCEDURE_NAME);
+ DropProcedureNode dropNode(getPool(), PRC.RDB$PROCEDURE_NAME);
dropNode.package = name;
dropNode.dsqlPass(dsqlScratch);
dropNode.executeDdl(tdbb, transaction);
Modified: firebird/trunk/src/dsql/PackageNodes.h
===================================================================
--- firebird/trunk/src/dsql/PackageNodes.h 2010-08-05 00:44:58 UTC (rev 51395)
+++ firebird/trunk/src/dsql/PackageNodes.h 2010-08-05 00:47:06 UTC (rev 51396)
@@ -65,9 +65,8 @@
};
public:
- CreateAlterPackageNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ CreateAlterPackageNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
name(pool, aName),
create(true),
alter(false),
@@ -116,9 +115,8 @@
class DropPackageNode : public DdlNode
{
public:
- DropPackageNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ DropPackageNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
name(pool, aName),
silent(false)
{
@@ -147,9 +145,8 @@
class CreatePackageBodyNode : public DdlNode
{
public:
- CreatePackageBodyNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ CreatePackageBodyNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
name(pool, aName),
source(pool),
declaredItems(NULL),
@@ -184,9 +181,8 @@
class DropPackageBodyNode : public DdlNode
{
public:
- DropPackageBodyNode(MemoryPool& pool, const Firebird::string& sqlText,
- const Firebird::MetaName& aName)
- : DdlNode(pool, sqlText),
+ DropPackageBodyNode(MemoryPool& pool, const Firebird::MetaName& aName)
+ : DdlNode(pool),
name(pool, aName),
silent(false)
{
Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y 2010-08-05 00:44:58 UTC (rev 51395)
+++ firebird/trunk/src/dsql/parse.y 2010-08-05 00:47:06 UTC (rev 51396)
@@ -1257,9 +1257,9 @@
recreate_clause
: PROCEDURE procedure_clause
- { $$ = makeClassNode(FB_NEW(getPool()) RecreateProcedureNode(getPool(), compilingText, $2)); }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreateProcedureNode(getPool(), $2)); }
| FUNCTION function_clause
- { $$ = makeClassNode(FB_NEW(getPool()) RecreateFunctionNode(getPool(), compilingText, $2)); }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreateFunctionNode(getPool(), $2)); }
| TABLE rtable_clause
{ $$ = $2; }
| GLOBAL TEMPORARY TABLE gtt_recreate_clause
@@ -1267,11 +1267,11 @@
| VIEW rview_clause
{ $$ = $2; }
| TRIGGER trigger_clause
- { $$ = makeClassNode(FB_NEW(getPool()) RecreateTriggerNode(getPool(), compilingText, $2)); }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreateTriggerNode(getPool(), $2)); }
| PACKAGE package_clause
- { $$ = makeClassNode(FB_NEW(getPool()) RecreatePackageNode(getPool(), compilingText, $2)); }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreatePackageNode(getPool(), $2)); }
| PACKAGE BODY package_body_clause
- { $$ = makeClassNode(FB_NEW(getPool()) RecreatePackageBodyNode(getPool(), compilingText, $3)); }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreatePackageBodyNode(getPool(), $3)); }
| EXCEPTION rexception_clause
{ $$ = $2; }
;
@@ -1302,7 +1302,7 @@
: symbol_exception_name sql_string
{
$$ = makeClassNode(FB_NEW(getPool()) CreateAlterExceptionNode(
- getPool(), compilingText, toName($1), toString($2)));
+ getPool(), toName($1), toString($2)));
}
;
@@ -1310,9 +1310,9 @@
: symbol_exception_name sql_string
{
CreateAlterExceptionNode* createNode = FB_NEW(getPool()) CreateAlterExceptionNode(
- getPool(), compilingText, toName($1), toString($2));
+ getPool(), toName($1), toString($2));
$$ = makeClassNode(FB_NEW(getPool()) RecreateExceptionNode(
- getPool(), compilingText, createNode));
+ getPool(), createNode));
}
;
@@ -1320,7 +1320,7 @@
: symbol_exception_name sql_string
{
CreateAlterExceptionNode* node = FB_NEW(getPool()) CreateAlterExceptionNode(
- getPool(), compilingText, toName($1), toString($2));
+ getPool(), toName($1), toString($2));
node->alter = true;
$$ = makeClassNode(node);
}
@@ -1330,7 +1330,7 @@
: symbol_exception_name sql_string
{
CreateAlterExceptionNode* node = FB_NEW(getPool()) CreateAlterExceptionNode(
- getPool(), compilingText, toName($1), toString($2));
+ getPool(), toName($1), toString($2));
node->create = false;
node->alter = true;
$$ = makeClassNode(node);
@@ -1400,7 +1400,7 @@
domain_clause
: column_def_name as_opt data_type domain_default_opt
{
- $<createDomainNode>$ = FB_NEW(getPool()) CreateDomainNode(getPool(), compilingText,
+ $<createDomainNode>$ = FB_NEW(getPool()) CreateDomainNode(getPool(),
ParameterClause((dsql_fld*) $1, "", $4, NULL));
}
domain_constraints_opt($5) collate_clause
@@ -1461,7 +1461,7 @@
generator_clause
: symbol_generator_name
{
- $$ = FB_NEW(getPool()) CreateSequenceNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateSequenceNode(getPool(), toName($1));
}
;
@@ -1479,7 +1479,7 @@
: symbol_collation_name FOR symbol_character_set_name
{
$<createCollationNode>$ = FB_NEW(getPool()) CreateCollationNode(
- getPool(), compilingText, toName($1), toName($3));
+ getPool(), toName($1), toName($3));
}
collation_sequence_definition($4)
collation_attribute_list_opt($4) collation_specific_attribute_opt($4)
@@ -1546,7 +1546,7 @@
alter_charset_clause
: symbol_character_set_name SET DEFAULT COLLATION symbol_collation_name
{
- $$ = FB_NEW(getPool()) AlterCharSetNode(getPool(), compilingText, toName($1), toName($5));
+ $$ = FB_NEW(getPool()) AlterCharSetNode(getPool(), toName($1), toName($5));
}
;
@@ -1672,28 +1672,19 @@
table_clause
: simple_table_name external_file
- {
- $<createRelationNode>$ = FB_NEW(getPool()) CreateRelationNode(
- getPool(), compilingText, $1, $2);
- }
+ { $<createRelationNode>$ = FB_NEW(getPool()) CreateRelationNode(getPool(), $1, $2); }
'(' table_elements($3) ')'
{ $$ = $3; }
;
rtable_clause
: table_clause
- {
- $$ = makeClassNode(FB_NEW(getPool()) RecreateTableNode(
- getPool(), compilingText, $1));
- }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreateTableNode(getPool(), $1)); }
;
gtt_table_clause
: simple_table_name
- {
- $<createRelationNode>$ = FB_NEW(getPool()) CreateRelationNode(
- getPool(), compilingText, $1);
- }
+ { $<createRelationNode>$ = FB_NEW(getPool()) CreateRelationNode(getPool(), $1); }
'(' table_elements($2) ')' gtt_scope
{
$$ = $2;
@@ -1703,10 +1694,7 @@
gtt_recreate_clause
: gtt_table_clause
- {
- $$ = makeClassNode(FB_NEW(getPool()) RecreateTableNode(
- getPool(), compilingText, $1));
- }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreateTableNode(getPool(), $1)); }
;
gtt_scope
@@ -1978,12 +1966,9 @@
procedure_clause_start
: symbol_procedure_name
- {
- $$ = FB_NEW(getPool()) CreateAlterProcedureNode(
- getPool(), compilingText, toName($1));
- }
- input_parameters(&$2->parameters) output_parameters(&$2->returns)
- { $$ = $2; }
+ { $$ = FB_NEW(getPool()) CreateAlterProcedureNode(getPool(), toName($1)); }
+ input_parameters(&$2->parameters) output_parameters(&$2->returns)
+ { $$ = $2; }
;
alter_procedure_clause
@@ -2064,15 +2049,15 @@
function_clause_start
: symbol_UDF_name
- { $$ = FB_NEW(getPool()) CreateAlterFunctionNode(getPool(), compilingText, toName($1)); }
- input_parameters(&$2->parameters)
- RETURNS { $<legacyField>$ = lex.g_field = make_field(NULL); }
- domain_or_non_array_type collate_clause deterministic_opt
- {
- $$ = $2;
- $$->returnType = TypeClause($<legacyField>5, toName($7));
- $$->invariant = ($8 != NULL);
- }
+ { $$ = FB_NEW(getPool()) CreateAlterFunctionNode(getPool(), toName($1)); }
+ input_parameters(&$2->parameters)
+ RETURNS { $<legacyField>$ = lex.g_field = make_field(NULL); }
+ domain_or_non_array_type collate_clause deterministic_opt
+ {
+ $$ = $2;
+ $$->returnType = TypeClause($<legacyField>5, toName($7));
+ $$->invariant = ($8 != NULL);
+ }
;
deterministic_opt
@@ -2130,7 +2115,7 @@
BEGIN package_items_opt END end_trigger
{
CreateAlterPackageNode* node = FB_NEW(getPool()) CreateAlterPackageNode(
- getPool(), compilingText, toName($1));
+ getPool(), toName($1));
node->source = toString($9);
node->items = $7;
@@ -2193,7 +2178,7 @@
BEGIN package_items package_body_items_opt END end_trigger
{
CreatePackageBodyNode* node = FB_NEW(getPool()) CreatePackageBodyNode(
- getPool(), compilingText, toName($1));
+ getPool(), toName($1));
node->source = toString($10);
node->declaredItems = $7;
node->items = $8;
@@ -2204,7 +2189,7 @@
BEGIN package_body_items_opt END end_trigger
{
CreatePackageBodyNode* node = FB_NEW(getPool()) CreatePackageBodyNode(
- getPool(), compilingText, toName($1));
+ getPool(), toName($1));
node->source = toString($9);
node->items = $7;
@@ -2750,7 +2735,7 @@
: simple_table_name column_parens_opt AS begin_string select_expr check_opt end_trigger
{
CreateAlterViewNode* node = FB_NEW(getPool()) CreateAlterViewNode(getPool(),
- compilingText, $1, $2, $5);
+ $1, $2, $5);
node->source = toString($7);
node->withCheckOption = $6;
$$ = node;
@@ -2759,10 +2744,7 @@
rview_clause
: view_clause
- {
- $$ = makeClassNode(FB_NEW(getPool()) RecreateViewNode(
- getPool(), compilingText, $1));
- }
+ { $$ = makeClassNode(FB_NEW(getPool()) RecreateViewNode( getPool(), $1)); }
;
replace_view_clause
@@ -2839,7 +2821,7 @@
full_proc_block
end_trigger
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->active = $2;
$$->type = $3;
$$->position = $4;
@@ -2853,7 +2835,7 @@
trigger_position
external_clause external_body_clause_opt
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->active = $2;
$$->type = $3;
$$->position = $4;
@@ -2871,7 +2853,7 @@
full_proc_block
end_trigger
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->active = $2;
$$->type = $3;
$$->position = $4;
@@ -2887,7 +2869,7 @@
ON symbol_table_name
external_clause external_body_clause_opt
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->active = $2;
$$->type = $3;
$$->position = $4;
@@ -2906,7 +2888,7 @@
full_proc_block
end_trigger
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->active = $4;
$$->type = $5;
$$->position = $6;
@@ -2922,7 +2904,7 @@
trigger_position
external_clause external_body_clause_opt
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->active = $4;
$$->type = $5;
$$->position = $6;
@@ -3084,8 +3066,7 @@
{ $$ = $2; }
| TABLE simple_table_name alter_ops
{
- AlterRelationNode* node = FB_NEW(getPool()) AlterRelationNode(getPool(),
- compilingText, $2);
+ AlterRelationNode* node = FB_NEW(getPool()) AlterRelationNode(getPool(), $2);
dsql_nod* list = make_list($3);
for (dsql_nod** ptr = list->nod_arg; ptr != list->nod_arg + list->nod_count; ++ptr)
@@ -3123,10 +3104,7 @@
alter_domain
: keyword_or_column
- {
- $<alterDomainNode>$ = FB_NEW(getPool()) AlterDomainNode(getPool(), compilingText,
- toName($1));
- }
+ { $<alterDomainNode>$ = FB_NEW(getPool()) AlterDomainNode(getPool(), toName($1)); }
alter_domain_ops($2)
{ $$ = $2; }
;
@@ -3405,7 +3383,7 @@
full_proc_block
end_trigger
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->alter = true;
$$->create = false;
$$->active = $2;
@@ -3421,7 +3399,7 @@
trigger_position
external_clause external_body_clause_opt
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->alter = true;
$$->create = false;
$$->active = $2;
@@ -3436,7 +3414,7 @@
trigger_type_opt
trigger_position
{
- $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), compilingText, toName($1));
+ $$ = FB_NEW(getPool()) CreateAlterTriggerNode(getPool(), toName($1));
$$->alter = true;
$$->create = false;
$$->active = $2;
@@ -3461,25 +3439,25 @@
drop_clause
: EXCEPTION symbol_exception_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropExceptionNode(getPool(), compilingText, toName($2))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropExceptionNode(getPool(), toName($2))); }
| INDEX symbol_index_name
{ $$ = make_node (nod_del_index, (int) 1, $2); }
| PROCEDURE symbol_procedure_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropProcedureNode(getPool(), compilingText, toName($2))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropProcedureNode(getPool(), toName($2))); }
| TABLE symbol_table_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropRelationNode(getPool(), compilingText, toName($2), false)); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropRelationNode(getPool(), toName($2), false)); }
| TRIGGER symbol_trigger_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropTriggerNode(getPool(), compilingText, toName($2))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropTriggerNode(getPool(), toName($2))); }
| VIEW symbol_view_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropRelationNode(getPool(), compilingText, toName($2), true)); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropRelationNode(getPool(), toName($2), true)); }
| FILTER symbol_filter_name
{ $$ = make_node (nod_del_filter, (int) 1, $2); }
| DOMAIN symbol_domain_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropDomainNode(getPool(), compilingText, toName($2))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropDomainNode(getPool(), toName($2))); }
| EXTERNAL FUNCTION symbol_UDF_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropFunctionNode(getPool(), compilingText, toName($3))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropFunctionNode(getPool(), toName($3))); }
| FUNCTION symbol_UDF_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropFunctionNode(getPool(), compilingText, toName($2))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropFunctionNode(getPool(), toName($2))); }
| SHADOW pos_short_integer
{ $$ = make_node (nod_del_shadow, (int) 1, (dsql_nod*)(IPTR) $2); }
| ROLE symbol_role_name
@@ -3489,13 +3467,13 @@
| SEQUENCE symbol_generator_name
{ $$ = make_node (nod_del_generator, (int) 1, $2); }
| COLLATION symbol_collation_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropCollationNode(getPool(), compilingText, toName($2))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropCollationNode(getPool(), toName($2))); }
| USER drop_user_clause
{ $$ = $2; }
| PACKAGE symbol_package_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropPackageNode(getPool(), compilingText, toName($2))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropPackageNode(getPool(), toName($2))); }
| PACKAGE BODY symbol_package_name
- { $$ = makeClassNode(FB_NEW(getPool()) DropPackageBodyNode(getPool(), compilingText, toName($3))); }
+ { $$ = makeClassNode(FB_NEW(getPool()) DropPackageBodyNode(getPool(), toName($3))); }
;
@@ -4160,17 +4138,17 @@
comment
: COMMENT ON ddl_type0 IS ddl_desc
{
- $$ = FB_NEW(getPool()) CommentOnNode(getPool(), compilingText, $3,
+ $$ = FB_NEW(getPool()) CommentOnNode(getPool(), $3,
"", "", ($5 ? toString($5) : ""), ($5 ? $5->str_charset : NULL));
}
| COMMENT ON ddl_type1 symbol_ddl_name IS ddl_desc
{
- $$ = FB_NEW(getPool()) CommentOnNode(getPool(), compilingText, $3,
+ $$ = FB_NEW(getPool()) CommentOnNode(getPool(), $3,
toName($4), "", ($6 ? toString($6) : ""), ($6 ? $6->str_charset : NULL));
}
| COMMENT ON ddl_type2 symbol_ddl_name ddl_subname IS ddl_desc
{
- $$ = FB_NEW(getPool()) CommentOnNode(getPool(), compilingText, $3,
+ $$ = FB_NEW(getPool()) CommentOnNode(getPool(), $3,
toName($4), toName($5), ($7 ? toString($7) : ""), ($7 ? $7->str_charset : NULL));
}
;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|