From 0c75576c521e4fd2920ec45f4889bce2f292d170 Mon Sep 17 00:00:00 2001 From: dpage Date: Mon, 8 Jun 2009 12:45:53 +0000 Subject: [PATCH] Disallow the use of edbspl and SQL for creating trigger functions (SQL can't do it, and edbspl should be inlined in the trigger). [Ashesh Vashi] git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7898 a7884b65-44f6-0310-8a51-81a127f17b15 --- pgadmin/dlg/dlgFunction.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pgadmin/dlg/dlgFunction.cpp b/pgadmin/dlg/dlgFunction.cpp index 9f7f9b767..0d049e0ed 100644 --- a/pgadmin/dlg/dlgFunction.cpp +++ b/pgadmin/dlg/dlgFunction.cpp @@ -238,9 +238,17 @@ int dlgFunction::Go(bool modal) while (!lang->Eof()) { wxString language=lang->GetVal(0); - if (factory != &triggerFunctionFactory || !language.IsSameAs(wxT("SQL"), false)) + if (factory == &triggerFunctionFactory) + { + if (language.IsSameAs(wxT("SQL"), false) || + language.IsSameAs(wxT("edbspl"), false)) + { + lang->MoveNext(); + continue; + } cbLanguage->Append(language); - lang->MoveNext(); + lang->MoveNext(); + } } delete lang; } -- 2.39.5