Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9e0ab71

Browse files
peterepetere
committed
Reimplement create and drop scripts in C, to reduce repetitive
connections, increase robustness, add NLS, and prepare for Windows port. (vacuumdb and clusterdb will follow later.)
1 parent cf1cf89 commit 9e0ab71

23 files changed

+1639
-1445
lines changed

‎doc/src/sgml/manage-ag.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/manage-ag.sgml,v 2.25 2003/03/13 01:30:29 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/manage-ag.sgml,v 2.26 2003/03/18 22:19:46 petere Exp $
33
-->
44

55
<chapter id="managing-databases">
@@ -120,8 +120,8 @@ createdb <replaceable class="parameter">dbname</replaceable>
120120

121121
<command>createdb</> does no magic. It connects to the <literal>template1</>
122122
database and issues the <command>CREATE DATABASE</> command,
123-
exactly as described above. It uses the <command>psql</> program
124-
internally. The reference page on <command>createdb</> contains the invocation
123+
exactly as described above.
124+
The reference page on <command>createdb</> contains the invocation
125125
details. Note that <command>createdb</> without any arguments will create
126126
a database with the current user name, which may or may not be what
127127
you want.

‎doc/src/sgml/ref/createdb.sgml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.30 2002/10/11 23:03:48 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.31 2003/03/18 22:19:46 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -42,16 +42,13 @@ PostgreSQL documentation
4242
</para>
4343

4444
<para>
45-
<application>createdb</application> is a shell script wrapper around the
46-
<acronym>SQL</acronym> command
47-
<xref linkend="SQL-CREATEDATABASE" endterm="SQL-CREATEDATABASE-title"> via
48-
the <productname>PostgreSQL</productname> interactive terminal
49-
<xref linkend="APP-PSQL">. Thus, there is nothing
50-
special about creating databases via this or other methods. This means
51-
that the <application>psql</application> program must be found by the script and that
52-
a database server must be running at the targeted port. Also, any default
53-
settings and environment variables available to <application>psql</application>
54-
and the <application>libpq</application> front-end library will apply.
45+
<application>createdb</application> is a wrapper around the
46+
<acronym>SQL</acronym> command <xref linkend="SQL-CREATEDATABASE"
47+
endterm="SQL-CREATEDATABASE-title">. Thus, there is nothing
48+
special about creating databases via this or other methods. This
49+
means that a database server must be running at the targeted
50+
port. Also, any default settings and environment variables used by
51+
the <application>libpq</application> front-end library will apply.
5552
</para>
5653
</refsect1>
5754

@@ -245,7 +242,7 @@ PostgreSQL documentation
245242
<para>
246243
If there is an error condition, the backend error message will be displayed.
247244
See <xref linkend="SQL-CREATEDATABASE" endterm="SQL-CREATEDATABASE-TITLE">
248-
and <xref linkend="APP-PSQL"> for possibilities.
245+
for possibilities.
249246
</para>
250247
</refsect1>
251248

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.29 2003/02/13 05:37:43 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.30 2003/03/18 22:19:46 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -197,8 +197,7 @@ PostgreSQL documentation
197197
Most error messages are self-explanatory. If not, run
198198
<application>createlang</application> with the <option>--echo</option>
199199
option and see under the respective <acronym>SQL</acronym> command
200-
for details. Check also under <xref linkend="APP-PSQL">
201-
for more possibilities.
200+
for details.
202201
</para>
203202
</refsect1>
204203

@@ -209,13 +208,6 @@ PostgreSQL documentation
209208
<para>
210209
Use <xref linkend="app-droplang"> to remove a language.
211210
</para>
212-
213-
<para>
214-
<application>createlang</application> is a shell script that invokes
215-
<application>psql</application> several times. If you have things
216-
arranged so that a password prompt is required to connect, you will be
217-
prompted for a password several times.
218-
</para>
219211
</refsect1>
220212

221213

‎doc/src/sgml/ref/createuser.sgml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.30 2003/02/13 05:37:43 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.31 2003/03/18 22:19:46 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -43,17 +43,13 @@ PostgreSQL documentation
4343
</para>
4444

4545
<para>
46-
<application>createuser</application> is a shell script wrapper around the
47-
<acronym>SQL</acronym> command
48-
<xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title"> via
49-
the <productname>PostgreSQL</productname> interactive terminal
50-
<xref linkend="APP-PSQL">. Thus, there is nothing
51-
special about creating users via this or other methods. This means
52-
that the <application>psql</application> application must be found by the
53-
script and that
54-
a database server must be running at the targeted host. Also, any default
55-
settings and environment variables used by <application>psql</application>
56-
and the <application>libpq</application> front-end library will apply.
46+
<application>createuser</application> is a wrapper around the
47+
<acronym>SQL</acronym> command <xref linkend="SQL-CREATEUSER"
48+
endterm="SQL-CREATEUSER-title">. Thus, there is nothing special
49+
about creating users via this or other methods. This means that a
50+
database server must be running at the targeted host. Also, any
51+
default settings and environment variables used by the
52+
<application>libpq</application> front-end library will apply.
5753
</para>
5854

5955
</refsect1>
@@ -293,7 +289,7 @@ PostgreSQL documentation
293289
<para>
294290
If there is an error condition, the backend error message will be displayed.
295291
See <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">
296-
and <xref linkend="APP-PSQL"> for possibilities.
292+
for possibilities.
297293
</para>
298294
</refsect1>
299295

‎doc/src/sgml/ref/dropdb.sgml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.19 2002/10/11 23:03:48 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.20 2003/03/18 22:19:46 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -35,16 +35,13 @@ PostgreSQL documentation
3535
</para>
3636

3737
<para>
38-
<application>dropdb</application> is a shell script wrapper around the
39-
<acronym>SQL</acronym> command
40-
<xref linkend="SQL-DROPDATABASE" endterm="SQL-DROPDATABASE-title"> via
41-
the <productname>PostgreSQL</productname> interactive terminal
42-
<xref linkend="APP-PSQL">. Thus, there is nothing
43-
special about dropping databases via this or other methods. This means
44-
that the <application>psql</application> must be found by the script and that
45-
a database server is running at the targeted host. Also, any default
46-
settings and environment variables available to <application>psql</application>
47-
and the <application>libpq</application> front-end library do apply.
38+
<application>dropdb</application> is a wrapper around the
39+
<acronym>SQL</acronym> command <xref linkend="SQL-DROPDATABASE"
40+
endterm="SQL-DROPDATABASE-title">. Thus, there is nothing special
41+
about dropping databases via this or other methods. This means that
42+
a database server is running at the targeted host. Also, any
43+
default settings and environment variables used by the
44+
<application>libpq</application> front-end library do apply.
4845
</para>
4946
</refsect1>
5047

@@ -176,7 +173,7 @@ PostgreSQL documentation
176173
<para>
177174
If there is an error condition, the backend error message will be displayed.
178175
See <xref linkend="SQL-DROPDATABASE" endterm="SQL-DROPDATABASE-title">
179-
and <xref linkend="APP-PSQL"> for possibilities.
176+
for possibilities.
180177
</para>
181178
</refsect1>
182179

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.21 2002/09/21 18:32:54 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.22 2003/03/18 22:19:46 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -186,8 +186,7 @@ PostgreSQL documentation
186186
Most error messages are self-explanatory. If not, run
187187
<application>droplang</application> with the <option>--echo</option>
188188
option and see under the respective <acronym>SQL</acronym> command
189-
for details. Check also under <xref linkend="APP-PSQL">
190-
for more possibilities.
189+
for details.
191190
</para>
192191
</refsect1>
193192

‎doc/src/sgml/ref/dropuser.sgml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.22 2002/10/11 23:03:48 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.23 2003/03/18 22:19:46 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -37,16 +37,14 @@ PostgreSQL documentation
3737
</para>
3838

3939
<para>
40-
<application>dropuser</application> is a shell script wrapper around the
41-
<acronym>SQL</acronym> command
42-
<xref linkend="SQL-DROPUSER" endterm="SQL-DROPUSER-title"> via
43-
the <productname>PostgreSQL</productname> interactive terminal
44-
<xref linkend="APP-PSQL">. Thus, there is nothing
45-
special about removing users via this or other methods. This means
46-
that the <application>psql</application> must be found by the script and that
47-
a database server is running at the targeted host. Also, any default
48-
settings and environment variables available to <application>psql</application>
49-
and the <application>libpq</application> front-end library do apply.
40+
<application>dropuser</application> is a shell script wrapper
41+
around the <acronym>SQL</acronym> command <xref
42+
linkend="SQL-DROPUSER" endterm="SQL-DROPUSER-title">. Thus, there
43+
is nothing special about removing users via this or other
44+
methods. This means that a database server is running at the
45+
targeted host. Also, any default settings and environment variables
46+
used by the <application>libpq</application> front-end library do
47+
apply.
5048
</para>
5149
</refsect1>
5250

‎src/bin/scripts/Makefile

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,64 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.18 2002/10/18 19:35:28 tgl Exp $
8+
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.19 2003/03/18 22:19:46 petere Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

1212
subdir = src/bin/scripts
1313
top_builddir = ../../..
1414
include $(top_builddir)/src/Makefile.global
1515

16-
SCRIPTS := createdb dropdb createuser dropuser createlang droplang vacuumdb \
17-
clusterdb
16+
SCRIPTS := vacuumdb clusterdb
17+
PROGRAMS = createdb createlang createuser dropdb droplang dropuser
1818

19-
all: $(SCRIPTS)
19+
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
20+
21+
22+
all: submake-libpq submake-backend $(PROGRAMS)
23+
24+
%: %.o
25+
$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
26+
27+
createdb: createdb.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/parser/keywords.o
28+
createlang: createlang.o common.o sprompt.o print.o mbprint.o
29+
createuser: createuser.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/parser/keywords.o
30+
dropdb: dropdb.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/parser/keywords.o
31+
droplang: droplang.o common.o sprompt.o print.o mbprint.o
32+
dropuser: dropuser.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/parser/keywords.o
33+
34+
createdb.o createuser.o dropdb.o dropuser.o dumputils.o: dumputils.h
35+
36+
createlang.o droplang.o: print.h
37+
print.o: print.h mbprint.h
38+
39+
dumputils.c dumputils.h sprompt.c : % : $(top_srcdir)/src/bin/pg_dump/%
40+
rm -f $@ && $(LN_S) $< .
41+
42+
print.c print.h mbprint.c mbprint.h : % : $(top_srcdir)/src/bin/psql/%
43+
rm -f $@ && $(LN_S) $< .
44+
45+
.PHONY: submake-backend
46+
submake-backend:
47+
$(MAKE) -C $(top_builddir)/src/backend/parser keywords.o
2048

21-
# we don't really need to edit createlang.sh at the moment,
22-
# but keep the old generation procedure in case we need it again.
23-
createlang: createlang.sh
24-
cp $< $@
25-
chmod a+x $@
2649

2750
install: all installdirs
28-
for i in $(filter-out createlang, $(SCRIPTS)); do \
29-
$(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(bindir)/$$i || exit; \
30-
done
31-
$(INSTALL_SCRIPT) createlang $(DESTDIR)$(bindir)/createlang
51+
$(INSTALL_PROGRAM) createdb$(X) $(DESTDIR)$(bindir)/createdb$(X)
52+
$(INSTALL_PROGRAM) dropdb$(X) $(DESTDIR)$(bindir)/dropdb$(X)
53+
$(INSTALL_PROGRAM) createlang$(X) $(DESTDIR)$(bindir)/createlang$(X)
54+
$(INSTALL_PROGRAM) droplang$(X) $(DESTDIR)$(bindir)/droplang$(X)
55+
$(INSTALL_PROGRAM) createuser$(X) $(DESTDIR)$(bindir)/createuser$(X)
56+
$(INSTALL_PROGRAM) dropuser$(X) $(DESTDIR)$(bindir)/dropuser$(X)
57+
$(INSTALL_SCRIPT) $(srcdir)/clusterdb $(DESTDIR)$(bindir)/clusterdb
58+
$(INSTALL_SCRIPT) $(srcdir)/vacuumdb $(DESTDIR)$(bindir)/vacuumdb
3259

3360
installdirs:
3461
$(mkinstalldirs) $(DESTDIR)$(bindir)
3562

3663
uninstall:
37-
rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS))
64+
rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS) $(addsuffix $(X), $(PROGRAMS)))
65+
3866

3967
clean distclean maintainer-clean:
40-
rm -f createlang
68+
rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS)) common.o dumputils.o sprompt.o print.o mbprint.o dumputils.c dumputils.h sprompt.c print.c print.h mbprint.c mbprint.h

0 commit comments

Comments
 (0)