Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2c6373f

Browse files
committed
Add --echo option to createlang and droplang.
from Oliver Elphick
1 parent91e3b85 commit2c6373f

File tree

4 files changed

+101
-28
lines changed

4 files changed

+101
-28
lines changed

‎doc/src/sgml/ref/createlang.sgml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.15 2000/12/25 23:15:26 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.16 2001/05/09 22:08:18 petere Exp $
33
Postgres documentation
44
-->
55

66
<refentry id="APP-CREATELANG">
77
<docinfo>
8-
<date>2000-11-11</date>
8+
<date>2001-05-09</date>
99
</docinfo>
1010

1111
<refmeta>
@@ -61,6 +61,15 @@ Postgres documentation
6161
</listitem>
6262
</varlistentry>
6363

64+
<varlistentry>
65+
<term>-e, --echo</term>
66+
<listitem>
67+
<para>
68+
Displays SQL commands as they are executed.
69+
</para>
70+
</listitem>
71+
</varlistentry>
72+
6473
<varlistentry>
6574
<term>-l, --list</term>
6675
<listitem>
@@ -71,6 +80,16 @@ Postgres documentation
7180
</listitem>
7281
</varlistentry>
7382

83+
<varlistentry>
84+
<term>--L <replaceable class="parameter">directory</replaceable></term>
85+
<listitem>
86+
<para>
87+
Specifies the directory in which the language interpreter is
88+
to be found. This is normally found automatically.
89+
</para>
90+
</listitem>
91+
</varlistentry>
92+
7493
</variablelist>
7594
</para>
7695

‎doc/src/sgml/ref/droplang.sgml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.9 2000/12/25 23:15:26 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.10 2001/05/09 22:08:18 petere Exp $
33
Postgres documentation
44
-->
55

66
<refentry id="APP-DROPLANG">
77
<docinfo>
8-
<date>2000-11-11</date>
8+
<date>2001-05-09</date>
99
</docinfo>
1010

1111
<refmeta>
@@ -61,6 +61,15 @@ Postgres documentation
6161
</listitem>
6262
</varlistentry>
6363

64+
<varlistentry>
65+
<term>-e, --echo</term>
66+
<listitem>
67+
<para>
68+
Displays SQL commands as they are executed.
69+
</para>
70+
</listitem>
71+
</varlistentry>
72+
6473
<varlistentry>
6574
<term>-l, --list</term>
6675
<listitem>

‎src/bin/scripts/createlang.sh

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
#!/bin/sh
1+
#!/bin/sh
22
#-------------------------------------------------------------------------
33
#
4-
# createlang.sh--
5-
#Install a procedural language in a database
4+
# createlang--
5+
# Install a procedural language in a database
66
#
77
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
# Portions Copyright (c) 1994, Regents of the University of California
99
#
10-
#
11-
# IDENTIFICATION
12-
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.23 2001/02/18 18:34:01 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.24 2001/05/09 22:08:19 petere Exp $
1311
#
1412
#-------------------------------------------------------------------------
1513

@@ -20,6 +18,7 @@ PSQLOPT=
2018
dbname=
2119
langname=
2220
list=
21+
showsql=
2322

2423
# Check for echo -n vs echo \c
2524

@@ -97,6 +96,9 @@ do
9796
--pglib=*)
9897
PGLIB=`echo"$1"| sed's/^--pglib=//'`
9998
;;
99+
--echo|-e)
100+
showsql=yes
101+
;;
100102

101103
-*)
102104
echo"$CMDNAME: invalid option:$1"1>&2
@@ -146,7 +148,7 @@ fi
146148
# ----------
147149
if [-z"$dbname" ];then
148150
echo"$CMDNAME: missing required argument database name"1>&2
149-
echo"Try '$CMDNAME -?' for help."1>&2
151+
echo"Try '$CMDNAME --help' for help."1>&2
150152
exit 1
151153
fi
152154

@@ -155,7 +157,11 @@ fi
155157
# List option
156158
# ----------
157159
if ["$list" ];then
158-
${PATHNAME}psql$PSQLOPT -d"$dbname" -P'title=Procedural languages' -c"SELECT lanname as\"Name\", lanpltrusted as\"Trusted?\", lancompiler as\"Compiler\" FROM pg_language WHERE lanispl = 't'"
160+
sqlcmd="SELECT lanname as\"Name\", lanpltrusted as\"Trusted?\", lancompiler as\"Compiler\" FROM pg_language WHERE lanispl = 't';"
161+
if ["$showsql"= yes ];then
162+
echo"$sqlcmd"
163+
fi
164+
${PATHNAME}psql$PSQLOPT -d"$dbname" -P'title=Procedural languages' -c"$sqlcmd"
159165
exit$?
160166
fi
161167

@@ -237,7 +243,11 @@ PSQL="${PATHNAME}psql -A -t -q $PSQLOPT -d $dbname -c"
237243
# ----------
238244
# Make sure the language isn't already installed
239245
# ----------
240-
res=`$PSQL"SELECT oid FROM pg_language WHERE lanname = '$langname'"`
246+
sqlcmd="SELECT oid FROM pg_language WHERE lanname = '$langname';"
247+
if ["$showsql"= yes ];then
248+
echo"$sqlcmd"
249+
fi
250+
res=`$PSQL"$sqlcmd"`
241251
if [$?-ne 0 ];then
242252
echo"$CMDNAME: external error"1>&2
243253
exit 1
@@ -251,7 +261,11 @@ fi
251261
# ----------
252262
# Check that there is no function named as the call handler
253263
# ----------
254-
res=`$PSQL"SELECT oid FROM pg_proc WHERE proname = '$handler'"`
264+
sqlcmd="SELECT oid FROM pg_proc WHERE proname = '$handler';"
265+
if ["$showsql"= yes ];then
266+
echo"$sqlcmd"
267+
fi
268+
res=`$PSQL"$sqlcmd"`
255269
if [!-z"$res" ];then
256270
echo"$CMDNAME: A function named '$handler' already exists. Installation aborted."1>&2
257271
exit 1
@@ -260,13 +274,21 @@ fi
260274
# ----------
261275
# Create the call handler and the language
262276
# ----------
263-
$PSQL"CREATE FUNCTION$handler () RETURNS OPAQUE AS '$PGLIB/${object}$DLSUFFIX' LANGUAGE 'C'"
277+
sqlcmd="CREATE FUNCTION$handler () RETURNS OPAQUE AS '$PGLIB/${object}$DLSUFFIX' LANGUAGE 'C';"
278+
if ["$showsql"= yes ];then
279+
echo"$sqlcmd"
280+
fi
281+
$PSQL"$sqlcmd"
264282
if [$?-ne 0 ];then
265283
echo"$CMDNAME: language installation failed"1>&2
266284
exit 1
267285
fi
268286

269-
$PSQL"CREATE${trusted}PROCEDURAL LANGUAGE '$langname' HANDLER$handler LANCOMPILER '$lancomp'"
287+
sqlcmd="CREATE${trusted}PROCEDURAL LANGUAGE '$langname' HANDLER$handler LANCOMPILER '$lancomp';"
288+
if ["$showsql"= yes ];then
289+
echo"$sqlcmd"
290+
fi
291+
$PSQL"$sqlcmd"
270292
if [$?-ne 0 ];then
271293
echo"$CMDNAME: language installation failed"1>&2
272294
exit 1

‎src/bin/scripts/droplang

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
#!/bin/sh
1+
#!/bin/sh
22
#-------------------------------------------------------------------------
33
#
4-
#createlang--
5-
#Remove a procedural language from a database
4+
#droplang--
5+
# Remove a procedural language from a database
66
#
77
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
# Portions Copyright (c) 1994, Regents of the University of California
99
#
10-
#
11-
# IDENTIFICATION
12-
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.13 2001/02/18 18:34:01 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.14 2001/05/09 22:08:19 petere Exp $
1311
#
1412
#-------------------------------------------------------------------------
1513

@@ -21,6 +19,7 @@ dbname=
2119
langname=
2220
echo=
2321
list=
22+
showsql=
2423

2524
# Check for echo -n vs echo \c
2625

@@ -87,6 +86,9 @@ do
8786
--dbname=*)
8887
dbname=`echo"$1"| sed's/^--dbname=//'`
8988
;;
89+
--echo|-e)
90+
showsql=yes
91+
;;
9092

9193
-*)
9294
echo"$CMDNAME: invalid option:$1"1>&2
@@ -128,7 +130,11 @@ fi
128130

129131

130132
if ["$list" ];then
131-
${PATHNAME}psql$PSQLOPT -d"$dbname" -P'title=Procedural languages' -c"SELECT lanname as\"Name\", lanpltrusted as\"Trusted?\", lancompiler as\"Compiler\" FROM pg_language WHERE lanispl = 't'"
133+
sqlcmd="SELECT lanname as\"Name\", lanpltrusted as\"Trusted?\", lancompiler as\"Compiler\" FROM pg_language WHERE lanispl = 't'"
134+
if ["$showsql"= yes ];then
135+
echo"$sqlcmd"
136+
fi
137+
${PATHNAME}psql$PSQLOPT -d"$dbname" -P'title=Procedural languages' -c"$sqlcmd"
132138
exit$?
133139
fi
134140

@@ -138,7 +144,7 @@ fi
138144
# ----------
139145
if [-z"$dbname" ];then
140146
echo"$CMDNAME: missing required argument database name"1>&2
141-
echo"Try '$CMDNAME -?' for help."1>&2
147+
echo"Try '$CMDNAME --help' for help."1>&2
142148
exit 1
143149
fi
144150

@@ -185,7 +191,11 @@ PSQL="${PATHNAME}psql -A -t -q $PSQLOPT -d $dbname -c"
185191
# ----------
186192
# Make sure the language is installed
187193
# ----------
188-
res=`$PSQL"SELECT oid FROM pg_language WHERE lanname = '$langname'"`
194+
sqlcmd="SELECT oid FROM pg_language WHERE lanname = '$langname';"
195+
if ["$showsql"= yes ];then
196+
echo"$sqlcmd"
197+
fi
198+
res=`$PSQL"$sqlcmd"`
189199
if [$?-ne 0 ];then
190200
echo"$CMDNAME: external error"1>&2
191201
exit 1
@@ -199,7 +209,11 @@ fi
199209
# ----------
200210
# Check that there are no functions left defined in that language
201211
# ----------
202-
res=`$PSQL"SELECT COUNT(proname) FROM pg_proc P, pg_language L WHERE P.prolang = L.oid AND L.lanname = '$langname'"`
212+
sqlcmd="SELECT COUNT(proname) FROM pg_proc P, pg_language L WHERE P.prolang = L.oid AND L.lanname = '$langname';"
213+
if ["$showsql"= yes ];then
214+
echo"$sqlcmd"
215+
fi
216+
res=`$PSQL"$sqlcmd"`
203217
if [$?-ne 0 ];then
204218
echo"$CMDNAME: external error"1>&2
205219
exit 1
@@ -213,12 +227,21 @@ fi
213227
# ----------
214228
# Drop the language and the call handler function
215229
# ----------
216-
$PSQL"DROP PROCEDURAL LANGUAGE '$langname'"
230+
sqlcmd="DROP PROCEDURAL LANGUAGE '$langname';"
231+
if ["$showsql"= yes ];then
232+
echo"$sqlcmd"
233+
fi
234+
$PSQL"$sqlcmd"
217235
if [$?-ne 0 ];then
218236
echo"$CMDNAME: language removal failed"1>&2
219237
exit 1
220238
fi
221-
$PSQL"DROP FUNCTION$handler()"
239+
240+
sqlcmd="DROP FUNCTION$handler();"
241+
if ["$showsql"= yes ];then
242+
echo"$sqlcmd"
243+
fi
244+
$PSQL"$sqlcmd"
222245
if [$?-ne 0 ];then
223246
echo"$CMDNAME: language removal failed"1>&2
224247
exit 1

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp