aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/parser/gram.y20
-rw-r--r--src/bin/scripts/createlang.sh54
-rw-r--r--src/bin/scripts/droplang89
3 files changed, 85 insertions, 78 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index c16bd865cef..391d821119a 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.243 2001/08/10 18:57:36 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.244 2001/08/13 21:34:51 petere Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -163,7 +163,8 @@ static void doNegateFloat(Value *v);
%type <list> OptUserList
%type <defelt> OptUserElem
-%type <boolean> TriggerActionTime, TriggerForSpec, PLangTrusted, opt_procedural
+%type <boolean> TriggerActionTime, TriggerForSpec, opt_trusted, opt_procedural
+%type <str> opt_lancompiler
%type <str> OptConstrFromTable
@@ -1688,23 +1689,26 @@ IntegerOnly: Iconst
*
*****************************************************************************/
-CreatePLangStmt: CREATE PLangTrusted opt_procedural LANGUAGE Sconst
- HANDLER func_name LANCOMPILER Sconst
+CreatePLangStmt: CREATE opt_trusted opt_procedural LANGUAGE ColId_or_Sconst
+ HANDLER func_name opt_lancompiler
{
CreatePLangStmt *n = makeNode(CreatePLangStmt);
n->plname = $5;
n->plhandler = $7;
- n->plcompiler = $9;
+ n->plcompiler = $8;
n->pltrusted = $2;
$$ = (Node *)n;
}
;
-PLangTrusted: TRUSTED { $$ = TRUE; }
+opt_trusted: TRUSTED { $$ = TRUE; }
| /*EMPTY*/ { $$ = FALSE; }
;
-DropPLangStmt: DROP opt_procedural LANGUAGE Sconst
+opt_lancompiler: LANCOMPILER Sconst { $$ = $2; }
+ | /*EMPTY*/ { $$ = ""; }
+
+DropPLangStmt: DROP opt_procedural LANGUAGE ColId_or_Sconst
{
DropPLangStmt *n = makeNode(DropPLangStmt);
n->plname = $4;
@@ -2511,7 +2515,7 @@ RecipeStmt: EXECUTE RECIPE recipe_name
*****************************************************************************/
ProcedureStmt: CREATE FUNCTION func_name func_args
- RETURNS func_return AS func_as LANGUAGE Sconst opt_with
+ RETURNS func_return AS func_as LANGUAGE ColId_or_Sconst opt_with
{
ProcedureStmt *n = makeNode(ProcedureStmt);
n->funcname = $3;
diff --git a/src/bin/scripts/createlang.sh b/src/bin/scripts/createlang.sh
index 7c4b959367a..fe9cf5fb0ea 100644
--- a/src/bin/scripts/createlang.sh
+++ b/src/bin/scripts/createlang.sh
@@ -7,7 +7,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.28 2001/06/18 21:40:06 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.29 2001/08/13 21:34:54 petere Exp $
#
#-------------------------------------------------------------------------
@@ -121,7 +121,7 @@ do
shift
done
-if [ "$usage" ]; then
+if [ -n "$usage" ]; then
echo "$CMDNAME installs a procedural language into a PostgreSQL database."
echo
echo "Usage:"
@@ -158,7 +158,7 @@ fi
# List option
# ----------
if [ "$list" ]; then
- sqlcmd="SELECT lanname as \"Name\", lanpltrusted as \"Trusted?\", lancompiler as \"Compiler\" FROM pg_language WHERE lanispl = 't';"
+ sqlcmd="SELECT lanname as \"Name\", lanpltrusted as \"Trusted?\" FROM pg_language WHERE lanispl = TRUE;"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi
@@ -185,46 +185,43 @@ fi
# ----------
# Check if supported and set related values
# ----------
+
+langname=`echo "$langname" | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+
case "$langname" in
plpgsql)
- lancomp="PL/pgSQL"
trusted="TRUSTED "
handler="plpgsql_call_handler"
object="plpgsql"
;;
pltcl)
- lancomp="PL/Tcl"
trusted="TRUSTED "
handler="pltcl_call_handler"
object="pltcl"
;;
pltclu)
- lancomp="PL/Tcl (untrusted)"
trusted=""
handler="pltclu_call_handler"
object="pltcl"
;;
plperl)
- lancomp="PL/Perl"
trusted="TRUSTED "
handler="plperl_call_handler"
object="plperl"
;;
plperlu)
- lancomp="PL/Perl (untrusted)"
trusted=""
handler="plperl_call_handler"
object="plperl"
;;
plpython)
- lancomp="PL/Python"
trusted="TRUSTED "
handler="plpython_call_handler"
object="plpython"
;;
*)
- echo "$CMDNAME: unsupported language '$langname'" 1>&2
- echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', 'plperl', and 'plpython'." 1>&2
+ echo "$CMDNAME: unsupported language \"$langname\"" 1>&2
+ echo "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and plpython." 1>&2
exit 1
;;
esac
@@ -244,39 +241,42 @@ if [ $? -ne 0 ]; then
echo "$CMDNAME: external error" 1>&2
exit 1
fi
-if [ "$res" ]; then
- echo "$CMDNAME: '$langname' is already installed in database $dbname" 1>&2
+if [ -n "$res" ]; then
+ echo "$CMDNAME: language \"$langname\" is already installed in database $dbname" 1>&2
# separate exit status for "already installed"
exit 2
fi
# ----------
-# Check that there is no function named as the call handler
+# Check whether the call handler exists
# ----------
-sqlcmd="SELECT oid FROM pg_proc WHERE proname = '$handler';"
+sqlcmd="SELECT oid FROM pg_proc WHERE proname = '$handler' AND prorettype = 0 AND pronargs = 0;"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi
res=`$PSQL "$sqlcmd"`
-if [ ! -z "$res" ]; then
- echo "$CMDNAME: A function named '$handler' already exists. Installation aborted." 1>&2
- exit 1
+if [ -n "$res" ]; then
+ handlerexists=yes
+else
+ handlerexists=no
fi
# ----------
# Create the call handler and the language
# ----------
-sqlcmd="CREATE FUNCTION $handler () RETURNS OPAQUE AS '$PGLIB/${object}' LANGUAGE 'C';"
-if [ "$showsql" = yes ]; then
- echo "$sqlcmd"
-fi
-$PSQL "$sqlcmd"
-if [ $? -ne 0 ]; then
- echo "$CMDNAME: language installation failed" 1>&2
- exit 1
+if [ "$handlerexists" = no ]; then
+ sqlcmd="CREATE FUNCTION \"$handler\" () RETURNS OPAQUE AS '$PGLIB/${object}' LANGUAGE C;"
+ if [ "$showsql" = yes ]; then
+ echo "$sqlcmd"
+ fi
+ $PSQL "$sqlcmd"
+ if [ $? -ne 0 ]; then
+ echo "$CMDNAME: language installation failed" 1>&2
+ exit 1
+ fi
fi
-sqlcmd="CREATE ${trusted}PROCEDURAL LANGUAGE '$langname' HANDLER $handler LANCOMPILER '$lancomp';"
+sqlcmd="CREATE ${trusted}LANGUAGE \"$langname\" HANDLER \"$handler\";"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi
diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang
index 82de3742d41..95d587cce0a 100644
--- a/src/bin/scripts/droplang
+++ b/src/bin/scripts/droplang
@@ -7,7 +7,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.15 2001/05/12 01:30:30 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.16 2001/08/13 21:34:54 petere Exp $
#
#-------------------------------------------------------------------------
@@ -130,7 +130,7 @@ fi
if [ "$list" ]; then
- sqlcmd="SELECT lanname as \"Name\", lanpltrusted as \"Trusted?\", lancompiler as \"Compiler\" FROM pg_language WHERE lanispl = 't'"
+ sqlcmd="SELECT lanname as \"Name\", lanpltrusted as \"Trusted?\" FROM pg_language WHERE lanispl = TRUE"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi
@@ -157,55 +157,23 @@ if [ -z "$langname" ]; then
read langname
fi
-# ----------
-# Check if supported and set related values
-# ----------
-case "$langname" in
- plpgsql)
- lancomp="PL/pgSQL"
- handler="plpgsql_call_handler"
- ;;
- pltcl)
- lancomp="PL/Tcl"
- handler="pltcl_call_handler"
- ;;
- pltclu)
- lancomp="PL/Tcl (untrusted)"
- handler="pltclu_call_handler"
- ;;
- plperl)
- lancomp="PL/Perl"
- handler="plperl_call_handler"
- ;;
- plpython)
- lancomp="PL/Python"
- handler="plpython_call_handler"
- ;;
- *)
- echo "$CMDNAME: unsupported language '$langname'" 1>&2
- echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', 'plperl', and 'plpython'." 1>&2
- exit 1
- ;;
-esac
-
-
PSQL="${PATHNAME}psql -A -t -q $PSQLOPT -d $dbname -c"
# ----------
-# Make sure the language is installed
+# Make sure the language is installed and find the oid of the handler function
# ----------
-sqlcmd="SELECT oid FROM pg_language WHERE lanname = '$langname';"
+sqlcmd="SELECT lanplcallfoid FROM pg_language WHERE lanname = '$langname' AND lanispl;"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi
-res=`$PSQL "$sqlcmd"`
+lanplcallfoid=`$PSQL "$sqlcmd"`
if [ $? -ne 0 ]; then
echo "$CMDNAME: external error" 1>&2
exit 1
fi
-if [ -z "$res" ]; then
- echo "$CMDNAME: '$langname' is not installed in database $dbname" 1>&2
+if [ -z "$lanplcallfoid" ]; then
+ echo "$CMDNAME: language \"$langname\" is not installed in database $dbname" 1>&2
exit 1
fi
@@ -224,14 +192,32 @@ if [ $? -ne 0 ]; then
fi
if [ "$res" -ne 0 ]; then
echo "$CMDNAME: There are $res functions/trigger procedures declared in language" 1>&2
- echo "$lancomp. Language not removed." 1>&2
+ echo "$langname. Language not removed." 1>&2
exit 1
fi
# ----------
-# Drop the language and the call handler function
+# Check that the handler function isn't used by some other language
# ----------
-sqlcmd="DROP PROCEDURAL LANGUAGE '$langname';"
+sqlcmd="SELECT count(*) FROM pg_language WHERE lanplcallfoid = $lanplcallfoid AND lanname <> '$langname';"
+if [ "$showsql" = yes ]; then
+ echo "$sqlcmd"
+fi
+res=`$PSQL "$sqlcmd"`
+if [ $? -ne 0 ]; then
+ echo "$CMDNAME: external error" 1>&2
+ exit 1
+fi
+if [ "$res" -eq 0 ]; then
+ keephandler=no
+else
+ keephandler=yes
+fi
+
+# ----------
+# Drop the language
+# ----------
+sqlcmd="DROP LANGUAGE \"$langname\";"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi
@@ -241,7 +227,24 @@ if [ $? -ne 0 ]; then
exit 1
fi
-sqlcmd="DROP FUNCTION $handler();"
+# ----------
+# Drop the call handler
+# ----------
+if [ "$keephandler" = yes ]; then
+ exit 0
+fi
+
+sqlcmd="SELECT proname FROM pg_proc WHERE oid = $lanplcallfoid;"
+if [ "$showsql" = yes ]; then
+ echo "$sqlcmd"
+fi
+handler=`$PSQL "$sqlcmd"`
+if [ $? -ne 0 ]; then
+ echo "$CMDNAME: external error" 1>&2
+ exit 1
+fi
+
+sqlcmd="DROP FUNCTION \"$handler\" ();"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 19:22:55 +0000