Skip to content

P
Postgres FD Implementation
Commit 15526ff0 authored by Bryan Henderson's avatar Bryan Henderson
Browse files
Options

Add messages to assist in problem diagnosis. Eliminate lines > 80 characters.

parent 634b38aa
Hide whitespace changes
Inline Side-by-side
Showing with 841 additions and 754 deletions
src/bin/pg_dump/pg_dump.c
View file @ 15526ff0
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.18 1996/11/26 07:38:19 bryanh Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.19 1996/12/27 23:12:54 bryanh Exp $
* *
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* *
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
#include <unistd.h> /* for getopt() */ #include <unistd.h> /* for getopt() */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */ #include <sys/param.h> /* for MAXHOSTNAMELEN on most */
#ifdef sparc_solaris #ifdef sparc_solaris
#include <netdb.h> /* for MAXHOSTNAMELEN on some */ #include <netdb.h> /* for MAXHOSTNAMELEN on some */
#endif #endif
#include "postgres.h" #include "postgres.h"
...@@ -64,7 +64,7 @@ extern char *optarg; ...@@ -64,7 +64,7 @@ extern char *optarg;
extern int optind, opterr; extern int optind, opterr;
/* global decls */ /* global decls */
int g_verbose; /* verbose flag */ bool g_verbose; /* User wants verbose narration of our activities. */
int g_last_builtin_oid; /* value of the last builtin oid */ int g_last_builtin_oid; /* value of the last builtin oid */
FILE *g_fout; /* the script file */ FILE *g_fout; /* the script file */
PGconn *g_conn; /* the database connection */ PGconn *g_conn; /* the database connection */
...@@ -81,19 +81,33 @@ char g_comment_end[10]; ...@@ -81,19 +81,33 @@ char g_comment_end[10];
static void static void
usage(const char* progname) usage(const char* progname)
{ {
fprintf(stderr, "%s - version 1.13.dhb.2\n\n",progname); fprintf(stderr,
fprintf(stderr, "usage: %s [options] [dbname]\n",progname); "%s - version 1.13.dhb.2\n\n",progname);
fprintf(stderr, "\t -f filename \t\t script output filename\n"); fprintf(stderr,
fprintf(stderr, "\t -H hostname \t\t server host name\n"); "usage: %s [options] [dbname]\n",progname);
fprintf(stderr, "\t -p port \t\t server port number\n"); fprintf(stderr,
fprintf(stderr, "\t -v \t\t verbose\n"); "\t -f filename \t\t script output filename\n");
fprintf(stderr, "\t -d \t\t dump data as proper insert strings\n"); fprintf(stderr,
fprintf(stderr, "\t -D \t\t dump data as inserts with attribute names\n"); "\t -H hostname \t\t server host name\n");
fprintf(stderr, "\t -S \t\t dump out only the schema, no data\n"); fprintf(stderr,
fprintf(stderr, "\t -a \t\t dump out only the data, no schema\n"); "\t -p port \t\t server port number\n");
fprintf(stderr, "\t -t table \t\t dump for this table only\n"); fprintf(stderr,
fprintf(stderr, "\t -o \t\t dump object id's (oids)\n"); "\t -v \t\t verbose\n");
fprintf(stderr, "\nIf dbname is not supplied, then the DATABASE environment name is used.\n"); fprintf(stderr,
"\t -d \t\t dump data as proper insert strings\n");
fprintf(stderr,
"\t -D \t\t dump data as inserts with attribute names\n");
fprintf(stderr,
"\t -S \t\t dump out only the schema, no data\n");
fprintf(stderr,
"\t -a \t\t dump out only the data, no schema\n");
fprintf(stderr,
"\t -t table \t\t dump for this table only\n");
fprintf(stderr,
"\t -o \t\t dump object id's (oids)\n");
fprintf(stderr,
"\nIf dbname is not supplied, then the DATABASE environment "
"variable value is used.\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
exit(1); exit(1);
...@@ -107,6 +121,201 @@ exit_nicely(PGconn* conn) ...@@ -107,6 +121,201 @@ exit_nicely(PGconn* conn)
} }
#define COPYBUFSIZ 8192
static void
dumpClasses_nodumpData(FILE *fout, const char *classname, const bool oids) {
PGresult *res;
char query[255];
int ret;
bool copydone;
char copybuf[COPYBUFSIZ];
if (oids) {
fprintf(fout, "COPY %s WITH OIDS FROM stdin;\n",
classname);
sprintf(query, "COPY %s WITH OIDS TO stdout;\n",
classname);
} else {
fprintf(fout, "COPY %s FROM stdin;\n", classname);
sprintf(query, "COPY %s TO stdout;\n", classname);
}
res = PQexec(g_conn, query);
if (!res) {
fprintf(stderr, "SQL query to dump the contents of Table %s "
"did not execute. Explanation from backend: '%s'.\n"
"The query was: '%s'.\n",
classname, PQerrorMessage(g_conn), query);
exit_nicely(g_conn);
} else {
if (PQresultStatus(res) != PGRES_COPY_OUT) {
fprintf(stderr,"SQL query to dump the contents of Table %s "
"executed abnormally.\n"
"PQexec() returned status %d when %d was expected.\n"
"The query was: '%s'.\n",
classname, PQresultStatus(res), PGRES_COPY_OUT, query);
exit_nicely(g_conn);
} else {
copydone = false;
while (!copydone) {
ret = PQgetline(res->conn, copybuf, COPYBUFSIZ);
if (copybuf[0] == '\\' &&
copybuf[1] == '.' &&
copybuf[2] == '\0') {
copydone = true; /* don't print this... */
} else {
fputs(copybuf, fout);
switch (ret) {
case EOF:
copydone = true;
/*FALLTHROUGH*/
case 0:
fputc('\n', fout);
break;
case 1:
break;
}
}
}
fprintf(fout, "\\.\n");
}
PQclear(res);
PQendcopy(res->conn);
}
}
static void
dumpClasses_dumpData(FILE *fout, const char *classname,
const TableInfo tblinfo, bool oids) {
PGresult *res;
char query[255];
int actual_atts; /* number of attrs in this a table */
char expandbuf[COPYBUFSIZ];
char q[MAXQUERYLEN];
int tuple;
int field;
sprintf(query, "select * from %s;\n", classname);
res = PQexec(g_conn, query);
if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"dumpClasses(): command failed\n");
exit_nicely(g_conn);
}
tuple=0;
while(tuple < PQntuples(res)) {
fprintf(fout, "insert into %s ", classname);
if (attrNames) {
int j;
actual_atts = 0;
sprintf(q, "(");
for (j=0;j<tblinfo.numatts;j++) {
if (tblinfo.inhAttrs[j] == 0) {
sprintf(q, "%s%s%s",
q,
(actual_atts > 0) ? "," : "",
tblinfo.attnames[j]);
actual_atts++;
}
}
sprintf(q,"%s%s",q, ") ");
fprintf(fout, q);
}
fprintf(fout, "values (");
field=0;
do {
if (PQgetisnull(res,tuple,field)) {
fprintf(fout,"NULL");
} else {
switch(PQftype(res,field)) {
case 21: case 22: case 23: /* int types */
case 810: case 910: /* oldint types */
case 1005: case 1006: case 1007: /* _int types */
case 700: case 701: /* float types */
case 1021: case 1022: /* _float types */
fprintf(fout, "%s",
PQgetvalue(res,tuple,field));
break;
default: {
char *expsrc,*expdest;
/* Before outputting string value, expand all
single quotes to twin single quotes -
dhb - 6/11/96 */
expsrc=PQgetvalue(res,tuple,field);
expdest=expandbuf;
while (*expsrc) {
*expdest++=*expsrc;
if (*expsrc == (char)0x27) /*single quote*/
*expdest++ = *expsrc;
expsrc++;
}
*expdest=*expsrc; /* null term. */
fprintf(fout, "'%s'", expandbuf);
}
break;
}
}
field++;
if(field != PQnfields(res))
fprintf(fout, ",");
} while(field < PQnfields(res));
fprintf(fout, ");\n");
tuple++;
}
PQclear(res);
}
/*
* DumpClasses -
* dump the contents of all the classes.
*/
static void
dumpClasses(const TableInfo tblinfo[], const int numTables, FILE *fout,
const char *onlytable, const bool oids) {
int i;
char *all_only;
if (onlytable = NULL) all_only = "all";
else all_only = "one";
if (g_verbose)
fprintf(stderr, "%s dumping out the contents of %s of %d tables %s\n",
g_comment_start, all_only, numTables, g_comment_end);
for(i = 0; i < numTables; i++) {
const char *classname = tblinfo[i].relname;
if (!onlytable || (!strcmp(classname,onlytable))) {
if (g_verbose)
fprintf(stderr, "%s dumping out the contents of Table %s %s\n",
g_comment_start, classname, g_comment_end);
/* skip archive names*/
if (isArchiveName(classname))
continue;
if(!dumpData)
dumpClasses_nodumpData(fout, classname, oids);
else
dumpClasses_dumpData(fout, classname, tblinfo[i], oids);
}
}
}
int int
main(int argc, char** argv) main(int argc, char** argv)
{ {
...@@ -126,7 +335,7 @@ main(int argc, char** argv) ...@@ -126,7 +335,7 @@ main(int argc, char** argv)
dbname = NULL; dbname = NULL;
filename = NULL; filename = NULL;
tablename = NULL; tablename = NULL;
g_verbose = 0; g_verbose = false;
oids = 0; oids = 0;
strcpy(g_comment_start,"-- "); strcpy(g_comment_start,"-- ");
...@@ -138,22 +347,22 @@ main(int argc, char** argv) ...@@ -138,22 +347,22 @@ main(int argc, char** argv)
progname = *argv; progname = *argv;
while ((c = getopt(argc, argv,"f:H:p:t:vSDdDao")) != EOF) { while ((c = getopt(argc, argv,"f:H:p:t:vSDdDao")) != EOF) {
switch(c) { switch(c) {
case 'f': /* output file name */ case 'f': /* output file name */
filename = optarg; filename = optarg;
break; break;
case 'H' : /* server host */ case 'H' : /* server host */
pghost = optarg; pghost = optarg;
break; break;
case 'p' : /* server port */ case 'p' : /* server port */
pgport = optarg; pgport = optarg;
break; break;
case 'v': /* verbose */ case 'v': /* verbose */
g_verbose = 1; g_verbose = true;
break; break;
case 'S': /* dump schema only */ case 'S': /* dump schema only */
schemaOnly = 1; schemaOnly = 1;
break; break;
case 'd': /* dump data as proper insert strings */ case 'd': /* dump data as proper insert strings */
dumpData = 1; dumpData = 1;
break; break;
...@@ -161,46 +370,47 @@ main(int argc, char** argv) ...@@ -161,46 +370,47 @@ main(int argc, char** argv)
dumpData = 1; dumpData = 1;
attrNames = 1; attrNames = 1;
break; break;
case 't': /* Dump data for this table only */ case 't': /* Dump data for this table only */
tablename = optarg; tablename = optarg;
break; break;
case 'a': /* Dump data only */ case 'a': /* Dump data only */
dataOnly = 1; dataOnly = 1;
break; break;
case 'o': /* Dump oids */ case 'o': /* Dump oids */
oids = 1; oids = 1;
break; break;
default: default:
usage(progname); usage(progname);
break; break;
} }
} }
/* open the output file */ /* open the output file */
if (filename == NULL) { if (filename == NULL) {
g_fout = stdout; g_fout = stdout;
} else { } else {
g_fout = fopen(filename, "w"); g_fout = fopen(filename, "w");
if (g_fout == NULL) { if (g_fout == NULL) {
fprintf(stderr,"%s: could not open output file named %s for writing\n", fprintf(stderr,
progname, filename); "%s: could not open output file named %s for writing\n",
exit(2); progname, filename);
} exit(2);
}
} }
/* find database */ /* find database */
if (!(dbname = argv[optind]) && if (!(dbname = argv[optind]) &&
!(dbname = getenv("DATABASE")) ) { !(dbname = getenv("DATABASE")) ) {
fprintf(stderr, "%s: no database name specified\n",progname); fprintf(stderr, "%s: no database name specified\n",progname);
exit (2); exit (2);
} }
g_conn = PQsetdb(pghost, pgport, NULL, NULL, dbname); g_conn = PQsetdb(pghost, pgport, NULL, NULL, dbname);
/* check to see that the backend connection was successfully made */ /* check to see that the backend connection was successfully made */
if (PQstatus(g_conn) == CONNECTION_BAD) { if (PQstatus(g_conn) == CONNECTION_BAD) {
fprintf(stderr,"Connection to database '%s' failed.\n", dbname); fprintf(stderr,"Connection to database '%s' failed.\n", dbname);
fprintf(stderr,"%s",PQerrorMessage(g_conn)); fprintf(stderr,"%s\n",PQerrorMessage(g_conn));
exit_nicely(g_conn); exit_nicely(g_conn);
} }
g_last_builtin_oid = findLastBuiltinOid(); g_last_builtin_oid = findLastBuiltinOid();
...@@ -208,23 +418,20 @@ main(int argc, char** argv) ...@@ -208,23 +418,20 @@ main(int argc, char** argv)
if (oids) if (oids)
setMaxOid(g_fout); setMaxOid(g_fout);
if (!dataOnly) { if (!dataOnly) {
if (g_verbose) if (g_verbose)
fprintf(stderr, "%s last builtin oid is %d %s\n", fprintf(stderr, "%s last builtin oid is %d %s\n",
g_comment_start, g_last_builtin_oid, g_comment_end); g_comment_start, g_last_builtin_oid, g_comment_end);
tblinfo = dumpSchema(g_fout, &numTables, tablename); tblinfo = dumpSchema(g_fout, &numTables, tablename);
} }
else else
tblinfo = dumpSchema(NULL, &numTables, tablename); tblinfo = dumpSchema(NULL, &numTables, tablename);
if (!schemaOnly) { if (!schemaOnly) {
if (g_verbose)
fprintf(stderr,"%s dumping out the contents of each table %s\n",
g_comment_start, g_comment_end);
dumpClasses(tblinfo, numTables, g_fout, tablename, oids); dumpClasses(tblinfo, numTables, g_fout, tablename, oids);
} }
if (!dataOnly) /* dump indexes at the end for performance */ if (!dataOnly) /* dump indexes at the end for performance */
dumpSchemaIdx(g_fout, &numTables, tablename, tblinfo, numTables); dumpSchemaIdx(g_fout, &numTables, tablename, tblinfo, numTables);
fflush(g_fout); fflush(g_fout);
fclose(g_fout); fclose(g_fout);
...@@ -268,9 +475,9 @@ getTypes(int *numTypes) ...@@ -268,9 +475,9 @@ getTypes(int *numTypes)
res = PQexec(g_conn, "begin"); res = PQexec(g_conn, "begin");
if (!res || if (!res ||
PQresultStatus(res) != PGRES_COMMAND_OK) { PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr,"BEGIN command failed\n"); fprintf(stderr,"BEGIN command failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
PQclear(res); PQclear(res);
...@@ -280,13 +487,15 @@ getTypes(int *numTypes) ...@@ -280,13 +487,15 @@ getTypes(int *numTypes)
/* we filter out the built-in types when /* we filter out the built-in types when
we dump out the types */ we dump out the types */
sprintf(query, "SELECT oid, typowner,typname, typlen, typprtlen, typinput, typoutput, typreceive, typsend, typelem, typdelim, typdefault, typrelid,typbyval from pg_type"); sprintf(query, "SELECT oid, typowner,typname, typlen, typprtlen, "
"typinput, typoutput, typreceive, typsend, typelem, typdelim, "
"typdefault, typrelid,typbyval from pg_type");
res = PQexec(g_conn,query); res = PQexec(g_conn,query);
if (!res || if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"getTypes(): SELECT failed"); fprintf(stderr,"getTypes(): SELECT failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
...@@ -309,32 +518,32 @@ getTypes(int *numTypes) ...@@ -309,32 +518,32 @@ getTypes(int *numTypes)
i_typbyval = PQfnumber(res,"typbyval"); i_typbyval = PQfnumber(res,"typbyval");
for (i=0;i<ntups;i++) { for (i=0;i<ntups;i++) {
tinfo[i].oid = strdup(PQgetvalue(res,i,i_oid)); tinfo[i].oid = strdup(PQgetvalue(res,i,i_oid));
tinfo[i].typowner = strdup(PQgetvalue(res,i,i_typowner)); tinfo[i].typowner = strdup(PQgetvalue(res,i,i_typowner));
tinfo[i].typname = strdup(PQgetvalue(res,i,i_typname)); tinfo[i].typname = strdup(PQgetvalue(res,i,i_typname));
tinfo[i].typlen = strdup(PQgetvalue(res,i,i_typlen)); tinfo[i].typlen = strdup(PQgetvalue(res,i,i_typlen));
tinfo[i].typprtlen = strdup(PQgetvalue(res,i,i_typprtlen)); tinfo[i].typprtlen = strdup(PQgetvalue(res,i,i_typprtlen));
tinfo[i].typinput = strdup(PQgetvalue(res,i,i_typinput)); tinfo[i].typinput = strdup(PQgetvalue(res,i,i_typinput));
tinfo[i].typoutput = strdup(PQgetvalue(res,i,i_typoutput)); tinfo[i].typoutput = strdup(PQgetvalue(res,i,i_typoutput));
tinfo[i].typreceive = strdup(PQgetvalue(res,i,i_typreceive)); tinfo[i].typreceive = strdup(PQgetvalue(res,i,i_typreceive));
tinfo[i].typsend = strdup(PQgetvalue(res,i,i_typsend)); tinfo[i].typsend = strdup(PQgetvalue(res,i,i_typsend));
tinfo[i].typelem = strdup(PQgetvalue(res,i,i_typelem)); tinfo[i].typelem = strdup(PQgetvalue(res,i,i_typelem));
tinfo[i].typdelim = strdup(PQgetvalue(res,i,i_typdelim)); tinfo[i].typdelim = strdup(PQgetvalue(res,i,i_typdelim));
tinfo[i].typdefault = strdup(PQgetvalue(res,i,i_typdefault)); tinfo[i].typdefault = strdup(PQgetvalue(res,i,i_typdefault));
tinfo[i].typrelid = strdup(PQgetvalue(res,i,i_typrelid)); tinfo[i].typrelid = strdup(PQgetvalue(res,i,i_typrelid));
if (strcmp(PQgetvalue(res,i,i_typbyval), "f") == 0) if (strcmp(PQgetvalue(res,i,i_typbyval), "f") == 0)
tinfo[i].passedbyvalue = 0; tinfo[i].passedbyvalue = 0;
else else
tinfo[i].passedbyvalue = 1; tinfo[i].passedbyvalue = 1;
/* check for user-defined array types, /* check for user-defined array types,
omit system generated ones */ omit system generated ones */
if ( (strcmp(tinfo[i].typelem, "0") != 0) && if ( (strcmp(tinfo[i].typelem, "0") != 0) &&
tinfo[i].typname[0] != '_') tinfo[i].typname[0] != '_')
tinfo[i].isArray = 1; tinfo[i].isArray = 1;
else else
tinfo[i].isArray = 0; tinfo[i].isArray = 0;
} }
*numTypes = ntups; *numTypes = ntups;
...@@ -384,19 +593,21 @@ getOperators(int *numOprs) ...@@ -384,19 +593,21 @@ getOperators(int *numOprs)
filter out system-defined operators at dump-out time */ filter out system-defined operators at dump-out time */
res = PQexec(g_conn, "begin"); res = PQexec(g_conn, "begin");
if (!res || if (!res ||
PQresultStatus(res) != PGRES_COMMAND_OK) { PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr,"BEGIN command failed\n"); fprintf(stderr,"BEGIN command failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
PQclear(res); PQclear(res);
sprintf(query, "SELECT oid, oprname, oprkind, oprcode, oprleft, oprright, oprcom, oprnegate, oprrest, oprjoin, oprcanhash, oprlsortop, oprrsortop from pg_operator"); sprintf(query, "SELECT oid, oprname, oprkind, oprcode, oprleft, "
"oprright, oprcom, oprnegate, oprrest, oprjoin, oprcanhash, "
"oprlsortop, oprrsortop from pg_operator");
res = PQexec(g_conn, query); res = PQexec(g_conn, query);
if (!res || if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"getOperators(): SELECT failed"); fprintf(stderr,"getOperators(): SELECT failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
...@@ -419,19 +630,19 @@ getOperators(int *numOprs) ...@@ -419,19 +630,19 @@ getOperators(int *numOprs)
i_oprrsortop = PQfnumber(res,"oprrsortop"); i_oprrsortop = PQfnumber(res,"oprrsortop");
for (i=0;i<ntups;i++) { for (i=0;i<ntups;i++) {
oprinfo[i].oid = strdup(PQgetvalue(res,i,i_oid)); oprinfo[i].oid = strdup(PQgetvalue(res,i,i_oid));
oprinfo[i].oprname = strdup(PQgetvalue(res,i,i_oprname)); oprinfo[i].oprname = strdup(PQgetvalue(res,i,i_oprname));
oprinfo[i].oprkind = strdup(PQgetvalue(res,i,i_oprkind)); oprinfo[i].oprkind = strdup(PQgetvalue(res,i,i_oprkind));
oprinfo[i].oprcode = strdup(PQgetvalue(res,i,i_oprcode)); oprinfo[i].oprcode = strdup(PQgetvalue(res,i,i_oprcode));
oprinfo[i].oprleft = strdup(PQgetvalue(res,i,i_oprleft)); oprinfo[i].oprleft = strdup(PQgetvalue(res,i,i_oprleft));
oprinfo[i].oprright = strdup(PQgetvalue(res,i,i_oprright)); oprinfo[i].oprright = strdup(PQgetvalue(res,i,i_oprright));
oprinfo[i].oprcom = strdup(PQgetvalue(res,i,i_oprcom)); oprinfo[i].oprcom = strdup(PQgetvalue(res,i,i_oprcom));
oprinfo[i].oprnegate = strdup(PQgetvalue(res,i,i_oprnegate)); oprinfo[i].oprnegate = strdup(PQgetvalue(res,i,i_oprnegate));
oprinfo[i].oprrest = strdup(PQgetvalue(res,i,i_oprrest)); oprinfo[i].oprrest = strdup(PQgetvalue(res,i,i_oprrest));
oprinfo[i].oprjoin = strdup(PQgetvalue(res,i,i_oprjoin)); oprinfo[i].oprjoin = strdup(PQgetvalue(res,i,i_oprjoin));
oprinfo[i].oprcanhash = strdup(PQgetvalue(res,i,i_oprcanhash)); oprinfo[i].oprcanhash = strdup(PQgetvalue(res,i,i_oprcanhash));
oprinfo[i].oprlsortop = strdup(PQgetvalue(res,i,i_oprlsortop)); oprinfo[i].oprlsortop = strdup(PQgetvalue(res,i,i_oprlsortop));
oprinfo[i].oprrsortop = strdup(PQgetvalue(res,i,i_oprrsortop)); oprinfo[i].oprrsortop = strdup(PQgetvalue(res,i,i_oprrsortop));
} }
PQclear(res); PQclear(res);
...@@ -475,20 +686,22 @@ getAggregates(int *numAggs) ...@@ -475,20 +686,22 @@ getAggregates(int *numAggs)
res = PQexec(g_conn, "begin"); res = PQexec(g_conn, "begin");
if (!res || if (!res ||
PQresultStatus(res) != PGRES_COMMAND_OK) { PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr,"BEGIN command failed\n"); fprintf(stderr,"BEGIN command failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
PQclear(res); PQclear(res);
sprintf(query, sprintf(query,
"SELECT oid, aggname, aggtransfn1, aggtransfn2, aggfinalfn, aggtranstype1, aggbasetype, aggtranstype2, agginitval1, agginitval2 from pg_aggregate;"); "SELECT oid, aggname, aggtransfn1, aggtransfn2, aggfinalfn, "
"aggtranstype1, aggbasetype, aggtranstype2, agginitval1, "
"agginitval2 from pg_aggregate;");
res = PQexec(g_conn, query); res = PQexec(g_conn, query);
if (!res || if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"getAggregates(): SELECT failed"); fprintf(stderr,"getAggregates(): SELECT failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
...@@ -508,16 +721,16 @@ getAggregates(int *numAggs) ...@@ -508,16 +721,16 @@ getAggregates(int *numAggs)
i_agginitval2 = PQfnumber(res,"agginitval2"); i_agginitval2 = PQfnumber(res,"agginitval2");
for (i=0;i<ntups;i++) { for (i=0;i<ntups;i++) {
agginfo[i].oid = strdup(PQgetvalue(res,i,i_oid)); agginfo[i].oid = strdup(PQgetvalue(res,i,i_oid));
agginfo[i].aggname = strdup(PQgetvalue(res,i,i_aggname)); agginfo[i].aggname = strdup(PQgetvalue(res,i,i_aggname));
agginfo[i].aggtransfn1 = strdup(PQgetvalue(res,i,i_aggtransfn1)); agginfo[i].aggtransfn1 = strdup(PQgetvalue(res,i,i_aggtransfn1));
agginfo[i].aggtransfn2 = strdup(PQgetvalue(res,i,i_aggtransfn2)); agginfo[i].aggtransfn2 = strdup(PQgetvalue(res,i,i_aggtransfn2));
agginfo[i].aggfinalfn = strdup(PQgetvalue(res,i,i_aggfinalfn)); agginfo[i].aggfinalfn = strdup(PQgetvalue(res,i,i_aggfinalfn));
agginfo[i].aggtranstype1 = strdup(PQgetvalue(res,i,i_aggtranstype1)); agginfo[i].aggtranstype1 = strdup(PQgetvalue(res,i,i_aggtranstype1));
agginfo[i].aggbasetype = strdup(PQgetvalue(res,i,i_aggbasetype)); agginfo[i].aggbasetype = strdup(PQgetvalue(res,i,i_aggbasetype));
agginfo[i].aggtranstype2 = strdup(PQgetvalue(res,i,i_aggtranstype2)); agginfo[i].aggtranstype2 = strdup(PQgetvalue(res,i,i_aggtranstype2));
agginfo[i].agginitval1 = strdup(PQgetvalue(res,i,i_agginitval1)); agginfo[i].agginitval1 = strdup(PQgetvalue(res,i,i_agginitval1));
agginfo[i].agginitval2 = strdup(PQgetvalue(res,i,i_agginitval2)); agginfo[i].agginitval2 = strdup(PQgetvalue(res,i,i_agginitval2));
} }
PQclear(res); PQclear(res);
...@@ -560,21 +773,23 @@ getFuncs(int *numFuncs) ...@@ -560,21 +773,23 @@ getFuncs(int *numFuncs)
res = PQexec(g_conn, "begin"); res = PQexec(g_conn, "begin");
if (!res || if (!res ||
PQresultStatus(res) != PGRES_COMMAND_OK) { PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr,"BEGIN command failed\n"); fprintf(stderr,"BEGIN command failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
PQclear(res); PQclear(res);
sprintf(query, sprintf(query,
"SELECT oid, proname, proowner, prolang, pronargs, prorettype, proretset, proargtypes, prosrc, probin from pg_proc where oid > '%d'::oid", "SELECT oid, proname, proowner, prolang, pronargs, prorettype, "
g_last_builtin_oid); "proretset, proargtypes, prosrc, probin from pg_proc "
"where oid > '%d'::oid",
g_last_builtin_oid);
res = PQexec(g_conn, query); res = PQexec(g_conn, query);
if (!res || if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"getFuncs(): SELECT failed"); fprintf(stderr,"getFuncs(): SELECT failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
...@@ -595,21 +810,21 @@ getFuncs(int *numFuncs) ...@@ -595,21 +810,21 @@ getFuncs(int *numFuncs)
i_probin = PQfnumber(res,"probin"); i_probin = PQfnumber(res,"probin");
for (i=0;i<ntups;i++) { for (i=0;i<ntups;i++) {
finfo[i].oid = strdup(PQgetvalue(res,i,i_oid)); finfo[i].oid = strdup(PQgetvalue(res,i,i_oid));
finfo[i].proname = strdup(PQgetvalue(res,i,i_proname)); finfo[i].proname = strdup(PQgetvalue(res,i,i_proname));
finfo[i].proowner = strdup(PQgetvalue(res,i,i_proowner)); finfo[i].proowner = strdup(PQgetvalue(res,i,i_proowner));
finfo[i].prosrc = checkForQuote(PQgetvalue(res,i,i_prosrc)); finfo[i].prosrc = checkForQuote(PQgetvalue(res,i,i_prosrc));
finfo[i].probin = strdup(PQgetvalue(res,i,i_probin)); finfo[i].probin = strdup(PQgetvalue(res,i,i_probin));
finfo[i].prorettype = strdup(PQgetvalue(res,i,i_prorettype)); finfo[i].prorettype = strdup(PQgetvalue(res,i,i_prorettype));
finfo[i].retset = (strcmp(PQgetvalue(res,i,i_proretset),"t") == 0); finfo[i].retset = (strcmp(PQgetvalue(res,i,i_proretset),"t") == 0);
finfo[i].nargs = atoi(PQgetvalue(res,i,i_pronargs)); finfo[i].nargs = atoi(PQgetvalue(res,i,i_pronargs));
finfo[i].lang = (atoi(PQgetvalue(res,i,i_prolang)) == C_PROLANG_OID); finfo[i].lang = (atoi(PQgetvalue(res,i,i_prolang)) == C_PROLANG_OID);
parseArgTypes(finfo[i].argtypes, PQgetvalue(res,i,i_proargtypes)); parseArgTypes(finfo[i].argtypes, PQgetvalue(res,i,i_proargtypes));
finfo[i].dumped = 0; finfo[i].dumped = 0;
} }
PQclear(res); PQclear(res);
...@@ -650,20 +865,22 @@ getTables(int *numTables) ...@@ -650,20 +865,22 @@ getTables(int *numTables)
res = PQexec(g_conn, "begin"); res = PQexec(g_conn, "begin");
if (!res || if (!res ||
PQresultStatus(res) != PGRES_COMMAND_OK) { PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr,"BEGIN command failed\n"); fprintf(stderr,"BEGIN command failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
PQclear(res); PQclear(res);
sprintf(query, sprintf(query,
"SELECT oid, relname, relarch from pg_class where relkind = 'r' and relname !~ '^pg_' and relname !~ '^Xinv' order by oid;"); "SELECT oid, relname, relarch from pg_class "
"where relkind = 'r' and relname !~ '^pg_' "
"and relname !~ '^Xinv' order by oid;");
res = PQexec(g_conn, query); res = PQexec(g_conn, query);
if (!res || if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"getTables(): SELECT failed"); fprintf(stderr,"getTables(): SELECT failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
...@@ -677,9 +894,9 @@ getTables(int *numTables) ...@@ -677,9 +894,9 @@ getTables(int *numTables)
i_relarch = PQfnumber(res,"relarch"); i_relarch = PQfnumber(res,"relarch");
for (i=0;i<ntups;i++) { for (i=0;i<ntups;i++) {
tblinfo[i].oid = strdup(PQgetvalue(res,i,i_oid)); tblinfo[i].oid = strdup(PQgetvalue(res,i,i_oid));
tblinfo[i].relname = strdup(PQgetvalue(res,i,i_relname)); tblinfo[i].relname = strdup(PQgetvalue(res,i,i_relname));
tblinfo[i].relarch = strdup(PQgetvalue(res,i,i_relarch)); tblinfo[i].relarch = strdup(PQgetvalue(res,i,i_relarch));
} }
PQclear(res); PQclear(res);
...@@ -714,9 +931,9 @@ getInherits(int *numInherits) ...@@ -714,9 +931,9 @@ getInherits(int *numInherits)
/* find all the inheritance information */ /* find all the inheritance information */
res = PQexec(g_conn, "begin"); res = PQexec(g_conn, "begin");
if (!res || if (!res ||
PQresultStatus(res) != PGRES_COMMAND_OK) { PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr,"BEGIN command failed\n"); fprintf(stderr,"BEGIN command failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
PQclear(res); PQclear(res);
...@@ -724,9 +941,9 @@ getInherits(int *numInherits) ...@@ -724,9 +941,9 @@ getInherits(int *numInherits)
res = PQexec(g_conn, query); res = PQexec(g_conn, query);
if (!res || if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"getInherits(): SELECT failed"); fprintf(stderr,"getInherits(): SELECT failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
...@@ -739,8 +956,8 @@ getInherits(int *numInherits) ...@@ -739,8 +956,8 @@ getInherits(int *numInherits)
i_inhparent = PQfnumber(res,"inhparent"); i_inhparent = PQfnumber(res,"inhparent");
for (i=0;i<ntups;i++) { for (i=0;i<ntups;i++) {
inhinfo[i].inhrel = strdup(PQgetvalue(res,i,i_inhrel)); inhinfo[i].inhrel = strdup(PQgetvalue(res,i,i_inhrel));
inhinfo[i].inhparent = strdup(PQgetvalue(res,i,i_inhparent)); inhinfo[i].inhparent = strdup(PQgetvalue(res,i,i_inhparent));
} }
PQclear(res); PQclear(res);
...@@ -772,50 +989,54 @@ getTableAttrs(TableInfo* tblinfo, int numTables) ...@@ -772,50 +989,54 @@ getTableAttrs(TableInfo* tblinfo, int numTables)
for (i=0;i<numTables;i++) { for (i=0;i<numTables;i++) {
/* skip archive tables */ /* skip archive tables */
if (isArchiveName(tblinfo[i].relname)) if (isArchiveName(tblinfo[i].relname))
continue; continue;
/* find all the user attributes and their types*/ /* find all the user attributes and their types*/
/* we must read the attribute names in attribute number order! */ /* we must read the attribute names in attribute number order! */
/* because we will use the attnum to index into the attnames array /* because we will use the attnum to index into the attnames array
later */ later */
if (g_verbose) if (g_verbose)
fprintf(stderr,"%s finding the attrs and types for table: %s %s\n", fprintf(stderr,"%s finding the attrs and types for table: %s %s\n",
g_comment_start, g_comment_start,
tblinfo[i].relname, tblinfo[i].relname,
g_comment_end); g_comment_end);
sprintf(q,"SELECT a.attnum, a.attname, t.typname, a.attlen from pg_attribute a, pg_type t where a.attrelid = '%s'::oid and a.atttypid = t.oid and a.attnum > 0 order by attnum",tblinfo[i].oid); sprintf(q,"SELECT a.attnum, a.attname, t.typname, a.attlen "
res = PQexec(g_conn, q); "from pg_attribute a, pg_type t "
if (!res || "where a.attrelid = '%s'::oid and a.atttypid = t.oid "
PQresultStatus(res) != PGRES_TUPLES_OK) { "and a.attnum > 0 order by attnum",
fprintf(stderr,"getTableAttrs(): SELECT failed"); tblinfo[i].oid);
exit_nicely(g_conn); res = PQexec(g_conn, q);
} if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) {
ntups = PQntuples(res); fprintf(stderr,"getTableAttrs(): SELECT failed\n");
exit_nicely(g_conn);
i_attname = PQfnumber(res,"attname"); }
i_typname = PQfnumber(res,"typname");
i_attlen = PQfnumber(res,"attlen"); ntups = PQntuples(res);
tblinfo[i].numatts = ntups; i_attname = PQfnumber(res,"attname");
tblinfo[i].attnames = (char**) malloc( ntups * sizeof(char*)); i_typname = PQfnumber(res,"typname");
tblinfo[i].typnames = (char**) malloc( ntups * sizeof(char*)); i_attlen = PQfnumber(res,"attlen");
tblinfo[i].attlen = (int*) malloc(ntups * sizeof(int));
tblinfo[i].inhAttrs = (int*) malloc (ntups * sizeof(int)); tblinfo[i].numatts = ntups;
tblinfo[i].parentRels = NULL; tblinfo[i].attnames = (char**) malloc( ntups * sizeof(char*));
tblinfo[i].numParents = 0; tblinfo[i].typnames = (char**) malloc( ntups * sizeof(char*));
for (j=0;j<ntups;j++) { tblinfo[i].attlen = (int*) malloc(ntups * sizeof(int));
tblinfo[i].attnames[j] = strdup(PQgetvalue(res,j,i_attname)); tblinfo[i].inhAttrs = (int*) malloc (ntups * sizeof(int));
tblinfo[i].typnames[j] = strdup(PQgetvalue(res,j,i_typname)); tblinfo[i].parentRels = NULL;
tblinfo[i].attlen[j] = atoi(PQgetvalue(res,j,i_attlen)); tblinfo[i].numParents = 0;
if (tblinfo[i].attlen[j] > 0) for (j=0;j<ntups;j++) {
tblinfo[i].attlen[j] = tblinfo[i].attlen[j] - 4; tblinfo[i].attnames[j] = strdup(PQgetvalue(res,j,i_attname));
tblinfo[i].inhAttrs[j] = 0; /* this flag is set in flagInhAttrs()*/ tblinfo[i].typnames[j] = strdup(PQgetvalue(res,j,i_typname));
} tblinfo[i].attlen[j] = atoi(PQgetvalue(res,j,i_attlen));
PQclear(res); if (tblinfo[i].attlen[j] > 0)
tblinfo[i].attlen[j] = tblinfo[i].attlen[j] - 4;
tblinfo[i].inhAttrs[j] = 0; /* this flag is set in flagInhAttrs()*/
}
PQclear(res);
} }
} }
...@@ -856,21 +1077,28 @@ getIndices(int *numIndices) ...@@ -856,21 +1077,28 @@ getIndices(int *numIndices)
res = PQexec(g_conn, "begin"); res = PQexec(g_conn, "begin");
if (!res || if (!res ||
PQresultStatus(res) != PGRES_COMMAND_OK) { PQresultStatus(res) != PGRES_COMMAND_OK) {
fprintf(stderr,"BEGIN command failed\n"); fprintf(stderr,"BEGIN command failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
PQclear(res); PQclear(res);
sprintf(query, sprintf(query,
"SELECT t1.relname as indexrelname, t2.relname as indrelname, i.indproc, i.indkey[0], o.opcname as indclassname, a.amname as indamname from pg_index i, pg_class t1, pg_class t2, pg_opclass o, pg_am a where t1.oid = i.indexrelid and t2.oid = i.indrelid and o.oid = i.indclass[0] and t1.relam = a.oid and i.indexrelid > '%d'::oid and t2.relname !~ '^pg_' and t1.relname !~ '^Xinx' ;", "SELECT t1.relname as indexrelname, t2.relname as indrelname, "
g_last_builtin_oid); "i.indproc, i.indkey[0], o.opcname as indclassname, "
"a.amname as indamname from pg_index i, pg_class t1, "
"pg_class t2, pg_opclass o, pg_am a "
"where t1.oid = i.indexrelid and t2.oid = i.indrelid "
"and o.oid = i.indclass[0] and t1.relam = a.oid and "
"i.indexrelid > '%d'::oid and t2.relname !~ '^pg_' "
"and t1.relname !~ '^Xinx' ;",
g_last_builtin_oid);
res = PQexec(g_conn, query); res = PQexec(g_conn, query);
if (!res || if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"getIndices(): SELECT failed"); fprintf(stderr,"getIndices(): SELECT failed\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
...@@ -887,12 +1115,12 @@ getIndices(int *numIndices) ...@@ -887,12 +1115,12 @@ getIndices(int *numIndices)
i_indclassname = PQfnumber(res,"indclassname"); i_indclassname = PQfnumber(res,"indclassname");
for (i=0;i<ntups;i++) { for (i=0;i<ntups;i++) {
indinfo[i].indexrelname = strdup(PQgetvalue(res,i,i_indexrelname)); indinfo[i].indexrelname = strdup(PQgetvalue(res,i,i_indexrelname));
indinfo[i].indrelname = strdup(PQgetvalue(res,i,i_indrelname)); indinfo[i].indrelname = strdup(PQgetvalue(res,i,i_indrelname));
indinfo[i].indamname = strdup(PQgetvalue(res,i,i_indamname)); indinfo[i].indamname = strdup(PQgetvalue(res,i,i_indamname));
indinfo[i].indproc = strdup(PQgetvalue(res,i,i_indproc)); indinfo[i].indproc = strdup(PQgetvalue(res,i,i_indproc));
indinfo[i].indkey = strdup(PQgetvalue(res,i,i_indkey)); indinfo[i].indkey = strdup(PQgetvalue(res,i,i_indkey));
indinfo[i].indclassname = strdup(PQgetvalue(res,i,i_indclassname)); indinfo[i].indclassname = strdup(PQgetvalue(res,i,i_indclassname));
} }
PQclear(res); PQclear(res);
res = PQexec(g_conn,"end"); res = PQexec(g_conn,"end");
...@@ -907,7 +1135,7 @@ getIndices(int *numIndices) ...@@ -907,7 +1135,7 @@ getIndices(int *numIndices)
*/ */
void void
dumpTypes(FILE* fout, FuncInfo* finfo, int numFuncs, dumpTypes(FILE* fout, FuncInfo* finfo, int numFuncs,
TypeInfo* tinfo, int numTypes) TypeInfo* tinfo, int numTypes)
{ {
int i; int i;
char q[MAXQUERYLEN]; char q[MAXQUERYLEN];
...@@ -915,54 +1143,56 @@ dumpTypes(FILE* fout, FuncInfo* finfo, int numFuncs, ...@@ -915,54 +1143,56 @@ dumpTypes(FILE* fout, FuncInfo* finfo, int numFuncs,
for (i=0;i<numTypes;i++) { for (i=0;i<numTypes;i++) {
/* skip all the builtin types */ /* skip all the builtin types */
if (atoi(tinfo[i].oid) < g_last_builtin_oid) if (atoi(tinfo[i].oid) < g_last_builtin_oid)
continue; continue;
/* skip relation types */ /* skip relation types */
if (atoi(tinfo[i].typrelid) != 0) if (atoi(tinfo[i].typrelid) != 0)
continue; continue;
/* skip all array types that start w/ underscore */ /* skip all array types that start w/ underscore */
if ( (tinfo[i].typname[0] == '_') && if ( (tinfo[i].typname[0] == '_') &&
(strcmp(tinfo[i].typinput, "array_in") == 0)) (strcmp(tinfo[i].typinput, "array_in") == 0))
continue; continue;
/* before we create a type, we need to create the input and /* before we create a type, we need to create the input and
output functions for it, if they haven't been created already */ output functions for it, if they haven't been created already */
funcInd = findFuncByName(finfo, numFuncs, tinfo[i].typinput); funcInd = findFuncByName(finfo, numFuncs, tinfo[i].typinput);
if (funcInd != -1) if (funcInd != -1)
dumpOneFunc(fout,finfo,funcInd,tinfo,numTypes); dumpOneFunc(fout,finfo,funcInd,tinfo,numTypes);
funcInd = findFuncByName(finfo, numFuncs, tinfo[i].typoutput); funcInd = findFuncByName(finfo, numFuncs, tinfo[i].typoutput);
if (funcInd != -1) if (funcInd != -1)
dumpOneFunc(fout,finfo,funcInd,tinfo,numTypes); dumpOneFunc(fout,finfo,funcInd,tinfo,numTypes);
sprintf(q, sprintf(q,
"CREATE TYPE %s ( internallength = %s, externallength = %s, input = %s, output = %s, send = %s, receive = %s, default = '%s'", "CREATE TYPE %s "
tinfo[i].typname, "( internallength = %s, externallength = %s, input = %s, "
tinfo[i].typlen, "output = %s, send = %s, receive = %s, default = '%s'",
tinfo[i].typprtlen, tinfo[i].typname,
tinfo[i].typinput, tinfo[i].typlen,
tinfo[i].typoutput, tinfo[i].typprtlen,
tinfo[i].typsend, tinfo[i].typinput,
tinfo[i].typreceive, tinfo[i].typoutput,
tinfo[i].typdefault); tinfo[i].typsend,
tinfo[i].typreceive,
if (tinfo[i].isArray) { tinfo[i].typdefault);
char* elemType;
if (tinfo[i].isArray) {
elemType = findTypeByOid(tinfo, numTypes, tinfo[i].typelem); char* elemType;
sprintf(q,"%s, element = %s, delimiter = '%s'", elemType = findTypeByOid(tinfo, numTypes, tinfo[i].typelem);
q, elemType,tinfo[i].typdelim);
} sprintf(q,"%s, element = %s, delimiter = '%s'",
if (tinfo[i].passedbyvalue) q, elemType,tinfo[i].typdelim);
strcat(q,",passedbyvalue);\n"); }
else if (tinfo[i].passedbyvalue)
strcat(q,");\n"); strcat(q,",passedbyvalue);\n");
else
fputs(q,fout); strcat(q,");\n");
fputs(q,fout);
} }
} }
...@@ -973,11 +1203,11 @@ dumpTypes(FILE* fout, FuncInfo* finfo, int numFuncs, ...@@ -973,11 +1203,11 @@ dumpTypes(FILE* fout, FuncInfo* finfo, int numFuncs,
*/ */
void void
dumpFuncs(FILE* fout, FuncInfo* finfo, int numFuncs, dumpFuncs(FILE* fout, FuncInfo* finfo, int numFuncs,
TypeInfo *tinfo, int numTypes) TypeInfo *tinfo, int numTypes)
{ {
int i; int i;
for (i=0;i<numFuncs;i++) { for (i=0;i<numFuncs;i++) {
dumpOneFunc(fout,finfo,i,tinfo,numTypes); dumpOneFunc(fout,finfo,i,tinfo,numTypes);
} }
} }
...@@ -990,31 +1220,31 @@ dumpFuncs(FILE* fout, FuncInfo* finfo, int numFuncs, ...@@ -990,31 +1220,31 @@ dumpFuncs(FILE* fout, FuncInfo* finfo, int numFuncs,
void void
dumpOneFunc(FILE* fout, FuncInfo* finfo, int i, dumpOneFunc(FILE* fout, FuncInfo* finfo, int i,
TypeInfo *tinfo, int numTypes) TypeInfo *tinfo, int numTypes)
{ {
char q[MAXQUERYLEN]; char q[MAXQUERYLEN];
int j; int j;
if (finfo[i].dumped) if (finfo[i].dumped)
return; return;
else else
finfo[i].dumped = 1; finfo[i].dumped = 1;
sprintf(q,"CREATE FUNCTION %s (",finfo[i].proname); sprintf(q,"CREATE FUNCTION %s (",finfo[i].proname);
for (j=0;j<finfo[i].nargs;j++) { for (j=0;j<finfo[i].nargs;j++) {
char* typname; char* typname;
typname = findTypeByOid(tinfo, numTypes, finfo[i].argtypes[j]); typname = findTypeByOid(tinfo, numTypes, finfo[i].argtypes[j]);
sprintf(q, "%s%s%s", sprintf(q, "%s%s%s",
q, q,
(j > 0) ? "," : "", (j > 0) ? "," : "",
typname); typname);
} }
sprintf(q,"%s ) RETURNS %s%s AS '%s' LANGUAGE '%s';\n", sprintf(q,"%s ) RETURNS %s%s AS '%s' LANGUAGE '%s';\n",
q, q,
finfo[i].retset ? " SETOF " : "", finfo[i].retset ? " SETOF " : "",
findTypeByOid(tinfo, numTypes, finfo[i].prorettype), findTypeByOid(tinfo, numTypes, finfo[i].prorettype),
(finfo[i].lang) ? finfo[i].probin : finfo[i].prosrc, (finfo[i].lang) ? finfo[i].probin : finfo[i].prosrc,
(finfo[i].lang) ? "C" : "SQL"); (finfo[i].lang) ? "C" : "SQL");
fputs(q,fout); fputs(q,fout);
...@@ -1027,7 +1257,7 @@ dumpOneFunc(FILE* fout, FuncInfo* finfo, int i, ...@@ -1027,7 +1257,7 @@ dumpOneFunc(FILE* fout, FuncInfo* finfo, int i,
*/ */
void void
dumpOprs(FILE* fout, OprInfo* oprinfo, int numOperators, dumpOprs(FILE* fout, OprInfo* oprinfo, int numOperators,
TypeInfo *tinfo, int numTypes) TypeInfo *tinfo, int numTypes)
{ {
int i; int i;
char q[MAXQUERYLEN]; char q[MAXQUERYLEN];
...@@ -1041,78 +1271,79 @@ dumpOprs(FILE* fout, OprInfo* oprinfo, int numOperators, ...@@ -1041,78 +1271,79 @@ dumpOprs(FILE* fout, OprInfo* oprinfo, int numOperators,
for (i=0;i<numOperators;i++) { for (i=0;i<numOperators;i++) {
/* skip all the builtin oids */ /* skip all the builtin oids */
if (atoi(oprinfo[i].oid) < g_last_builtin_oid) if (atoi(oprinfo[i].oid) < g_last_builtin_oid)
continue; continue;
/* some operator are invalid because they were the result /* some operator are invalid because they were the result
of user defining operators before commutators exist */ of user defining operators before commutators exist */
if (strcmp(oprinfo[i].oprcode, "-") == 0) if (strcmp(oprinfo[i].oprcode, "-") == 0)
continue; continue;
leftarg[0] = '\0'; leftarg[0] = '\0';
rightarg[0] = '\0'; rightarg[0] = '\0';
/* right unary means there's a left arg /* right unary means there's a left arg
and left unary means there's a right arg */ and left unary means there's a right arg */
if (strcmp(oprinfo[i].oprkind, "r") == 0 || if (strcmp(oprinfo[i].oprkind, "r") == 0 ||
strcmp(oprinfo[i].oprkind, "b") == 0 ) { strcmp(oprinfo[i].oprkind, "b") == 0 ) {
sprintf(leftarg, ", LEFTARG = %s ", sprintf(leftarg, ", LEFTARG = %s ",
findTypeByOid(tinfo, numTypes, oprinfo[i].oprleft)); findTypeByOid(tinfo, numTypes, oprinfo[i].oprleft));
} }
if (strcmp(oprinfo[i].oprkind, "l") == 0 || if (strcmp(oprinfo[i].oprkind, "l") == 0 ||
strcmp(oprinfo[i].oprkind, "b") == 0 ) { strcmp(oprinfo[i].oprkind, "b") == 0 ) {
sprintf(rightarg, ", RIGHTARG = %s ", sprintf(rightarg, ", RIGHTARG = %s ",
findTypeByOid(tinfo, numTypes, oprinfo[i].oprright)); findTypeByOid(tinfo, numTypes, oprinfo[i].oprright));
} }
if (strcmp(oprinfo[i].oprcom, "0") == 0) if (strcmp(oprinfo[i].oprcom, "0") == 0)
commutator[0] = '\0'; commutator[0] = '\0';
else else
sprintf(commutator,", COMMUTATOR = %s ", sprintf(commutator,", COMMUTATOR = %s ",
findOprByOid(oprinfo, numOperators, oprinfo[i].oprcom)); findOprByOid(oprinfo, numOperators, oprinfo[i].oprcom));
if (strcmp(oprinfo[i].oprnegate, "0") == 0) if (strcmp(oprinfo[i].oprnegate, "0") == 0)
negator[0] = '\0'; negator[0] = '\0';
else else
sprintf(negator,", NEGATOR = %s ", sprintf(negator,", NEGATOR = %s ",
findOprByOid(oprinfo, numOperators, oprinfo[i].oprnegate)); findOprByOid(oprinfo, numOperators, oprinfo[i].oprnegate));
if (strcmp(oprinfo[i].oprrest, "-") == 0) if (strcmp(oprinfo[i].oprrest, "-") == 0)
restrict[0] = '\0'; restrict[0] = '\0';
else else
sprintf(restrict,", RESTRICT = %s ", oprinfo[i].oprrest); sprintf(restrict,", RESTRICT = %s ", oprinfo[i].oprrest);
if (strcmp(oprinfo[i].oprjoin,"-") == 0) if (strcmp(oprinfo[i].oprjoin,"-") == 0)
join[0] = '\0'; join[0] = '\0';
else else
sprintf(join,", JOIN = %s ", oprinfo[i].oprjoin); sprintf(join,", JOIN = %s ", oprinfo[i].oprjoin);
if (strcmp(oprinfo[i].oprlsortop, "0") == 0) if (strcmp(oprinfo[i].oprlsortop, "0") == 0)
sortop[0] = '\0'; sortop[0] = '\0';
else else
{ {
sprintf(sortop,", SORT = %s ", sprintf(sortop,", SORT = %s ",
findOprByOid(oprinfo, numOperators, findOprByOid(oprinfo, numOperators,
oprinfo[i].oprlsortop)); oprinfo[i].oprlsortop));
if (strcmp(oprinfo[i].oprrsortop, "0") != 0) if (strcmp(oprinfo[i].oprrsortop, "0") != 0)
sprintf(sortop, "%s , %s", sortop, sprintf(sortop, "%s , %s", sortop,
findOprByOid(oprinfo, numOperators, findOprByOid(oprinfo, numOperators,
oprinfo[i].oprlsortop)); oprinfo[i].oprlsortop));
} }
sprintf(q, sprintf(q,
"CREATE OPERATOR %s (PROCEDURE = %s %s %s %s %s %s %s %s %s);\n ", "CREATE OPERATOR %s "
oprinfo[i].oprname, "(PROCEDURE = %s %s %s %s %s %s %s %s %s);\n ",
oprinfo[i].oprcode, oprinfo[i].oprname,
leftarg, oprinfo[i].oprcode,
rightarg, leftarg,
commutator, rightarg,
negator, commutator,
restrict, negator,
(strcmp(oprinfo[i].oprcanhash, "t")) ? ", HASHES" : "", restrict,
(strcmp(oprinfo[i].oprcanhash, "t")) ? ", HASHES" : "",
join, join,
sortop); sortop);
fputs(q,fout); fputs(q,fout);
} }
} }
...@@ -1123,7 +1354,7 @@ dumpOprs(FILE* fout, OprInfo* oprinfo, int numOperators, ...@@ -1123,7 +1354,7 @@ dumpOprs(FILE* fout, OprInfo* oprinfo, int numOperators,
*/ */
void void
dumpAggs(FILE* fout, AggInfo* agginfo, int numAggs, dumpAggs(FILE* fout, AggInfo* agginfo, int numAggs,
TypeInfo *tinfo, int numTypes) TypeInfo *tinfo, int numTypes)
{ {
int i; int i;
char q[MAXQUERYLEN]; char q[MAXQUERYLEN];
...@@ -1133,60 +1364,60 @@ dumpAggs(FILE* fout, AggInfo* agginfo, int numAggs, ...@@ -1133,60 +1364,60 @@ dumpAggs(FILE* fout, AggInfo* agginfo, int numAggs,
char comma1[2], comma2[2]; char comma1[2], comma2[2];
for (i=0;i<numAggs;i++) { for (i=0;i<numAggs;i++) {
/* skip all the builtin oids */ /* skip all the builtin oids */
if (atoi(agginfo[i].oid) < g_last_builtin_oid) if (atoi(agginfo[i].oid) < g_last_builtin_oid)
continue; continue;
if ( strcmp(agginfo[i].aggtransfn1, "-") == 0) if ( strcmp(agginfo[i].aggtransfn1, "-") == 0)
sfunc1[0] = '\0'; sfunc1[0] = '\0';
else { else {
sprintf(sfunc1, sprintf(sfunc1,
"SFUNC1 = %s, BASETYPE = %s, STYPE1 = %s", "SFUNC1 = %s, BASETYPE = %s, STYPE1 = %s",
agginfo[i].aggtransfn1, agginfo[i].aggtransfn1,
findTypeByOid(tinfo,numTypes,agginfo[i].aggbasetype), findTypeByOid(tinfo,numTypes,agginfo[i].aggbasetype),
findTypeByOid(tinfo,numTypes,agginfo[i].aggtranstype1)); findTypeByOid(tinfo,numTypes,agginfo[i].aggtranstype1));
if (agginfo[i].agginitval1) if (agginfo[i].agginitval1)
sprintf(sfunc1, "%s ,INITCOND1 = '%s'", sprintf(sfunc1, "%s ,INITCOND1 = '%s'",
sfunc1, agginfo[i].agginitval1); sfunc1, agginfo[i].agginitval1);
} }
if ( strcmp(agginfo[i].aggtransfn2, "-") == 0) if ( strcmp(agginfo[i].aggtransfn2, "-") == 0)
sfunc2[0] = '\0'; sfunc2[0] = '\0';
else { else {
sprintf(sfunc2, sprintf(sfunc2,
"SFUNC2 = %s, STYPE2 = %s", "SFUNC2 = %s, STYPE2 = %s",
agginfo[i].aggtransfn2, agginfo[i].aggtransfn2,
findTypeByOid(tinfo,numTypes,agginfo[i].aggtranstype2)); findTypeByOid(tinfo,numTypes,agginfo[i].aggtranstype2));
if (agginfo[i].agginitval2) if (agginfo[i].agginitval2)
sprintf(sfunc2,"%s ,INITCOND2 = '%s'", sprintf(sfunc2,"%s ,INITCOND2 = '%s'",
sfunc2, agginfo[i].agginitval2); sfunc2, agginfo[i].agginitval2);
} }
if ( strcmp(agginfo[i].aggfinalfn, "-") == 0) if ( strcmp(agginfo[i].aggfinalfn, "-") == 0)
finalfunc[0] = '\0'; finalfunc[0] = '\0';
else { else {
sprintf(finalfunc, "FINALFUNC = %s", agginfo[i].aggfinalfn); sprintf(finalfunc, "FINALFUNC = %s", agginfo[i].aggfinalfn);
} }
if (sfunc1[0] != '\0' && sfunc2[0] != '\0') { if (sfunc1[0] != '\0' && sfunc2[0] != '\0') {
comma1[0] = ','; comma1[1] = '\0'; comma1[0] = ','; comma1[1] = '\0';
} else } else
comma1[0] = '\0'; comma1[0] = '\0';
if (finalfunc[0] != '\0' && (sfunc1[0] != '\0' || sfunc2[0] != '\0')) { if (finalfunc[0] != '\0' && (sfunc1[0] != '\0' || sfunc2[0] != '\0')) {
comma2[0] = ',';comma2[1] = '\0'; comma2[0] = ',';comma2[1] = '\0';
} else } else
comma2[0] = '\0'; comma2[0] = '\0';
sprintf(q,"CREATE AGGREGATE %s ( %s %s %s %s %s );\n", sprintf(q,"CREATE AGGREGATE %s ( %s %s %s %s %s );\n",
agginfo[i].aggname, agginfo[i].aggname,
sfunc1, sfunc1,
comma1, comma1,
sfunc2, sfunc2,
comma2, comma2,
finalfunc); finalfunc);
fputs(q,fout); fputs(q,fout);
} }
} }
...@@ -1196,8 +1427,8 @@ dumpAggs(FILE* fout, AggInfo* agginfo, int numAggs, ...@@ -1196,8 +1427,8 @@ dumpAggs(FILE* fout, AggInfo* agginfo, int numAggs,
*/ */
void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables, void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables,
InhInfo *inhinfo, int numInherits, InhInfo *inhinfo, int numInherits,
TypeInfo *tinfo, int numTypes, const char *tablename) TypeInfo *tinfo, int numTypes, const char *tablename)
{ {
int i,j,k; int i,j,k;
char q[MAXQUERYLEN]; char q[MAXQUERYLEN];
...@@ -1210,90 +1441,90 @@ void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables, ...@@ -1210,90 +1441,90 @@ void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables,
if (!tablename || (!strcmp(tblinfo[i].relname,tablename))) { if (!tablename || (!strcmp(tblinfo[i].relname,tablename))) {
/* skip archive names*/ /* skip archive names*/
if (isArchiveName(tblinfo[i].relname)) if (isArchiveName(tblinfo[i].relname))
continue; continue;
parentRels = tblinfo[i].parentRels; parentRels = tblinfo[i].parentRels;
numParents = tblinfo[i].numParents; numParents = tblinfo[i].numParents;
sprintf(q, "CREATE TABLE %s (", tblinfo[i].relname); sprintf(q, "CREATE TABLE %s (", tblinfo[i].relname);
actual_atts = 0; actual_atts = 0;
for (j=0;j<tblinfo[i].numatts;j++) { for (j=0;j<tblinfo[i].numatts;j++) {
if (tblinfo[i].inhAttrs[j] == 0) { if (tblinfo[i].inhAttrs[j] == 0) {
/* Show lengths on bpchar and varchar */ /* Show lengths on bpchar and varchar */
if (!strcmp(tblinfo[i].typnames[j],"bpchar")) { if (!strcmp(tblinfo[i].typnames[j],"bpchar")) {
sprintf(q, "%s%s%s char", sprintf(q, "%s%s%s char",
q, q,
(actual_atts > 0) ? ", " : "", (actual_atts > 0) ? ", " : "",
tblinfo[i].attnames[j]); tblinfo[i].attnames[j]);
/* stored length can be -1 (variable) */ /* stored length can be -1 (variable) */
if (tblinfo[i].attlen[j] > 0) if (tblinfo[i].attlen[j] > 0)
sprintf(q, "%s(%d)", sprintf(q, "%s(%d)",
q, q,
tblinfo[i].attlen[j]); tblinfo[i].attlen[j]);
actual_atts++; actual_atts++;
} }
else if (!strcmp(tblinfo[i].typnames[j],"varchar")) { else if (!strcmp(tblinfo[i].typnames[j],"varchar")) {
sprintf(q, "%s%s%s %s", sprintf(q, "%s%s%s %s",
q, q,
(actual_atts > 0) ? ", " : "", (actual_atts > 0) ? ", " : "",
tblinfo[i].attnames[j], tblinfo[i].attnames[j],
tblinfo[i].typnames[j]); tblinfo[i].typnames[j]);
/* stored length can be -1 (variable) */ /* stored length can be -1 (variable) */
if (tblinfo[i].attlen[j] > 0) if (tblinfo[i].attlen[j] > 0)
sprintf(q, "%s(%d)", sprintf(q, "%s(%d)",
q, q,
tblinfo[i].attlen[j]); tblinfo[i].attlen[j]);
actual_atts++; actual_atts++;
} }
else { else {
sprintf(q, "%s%s%s %s", sprintf(q, "%s%s%s %s",
q, q,
(actual_atts > 0) ? ", " : "", (actual_atts > 0) ? ", " : "",
tblinfo[i].attnames[j], tblinfo[i].attnames[j],
tblinfo[i].typnames[j]); tblinfo[i].typnames[j]);
actual_atts++; actual_atts++;
} }
} }
} }
strcat(q,")"); strcat(q,")");
if (numParents > 0) { if (numParents > 0) {
sprintf(q, "%s inherits ( ",q); sprintf(q, "%s inherits ( ",q);
for (k=0;k<numParents;k++){ for (k=0;k<numParents;k++){
sprintf(q, "%s%s%s", sprintf(q, "%s%s%s",
q, q,
(k>0) ? ", " : "", (k>0) ? ", " : "",
parentRels[k]); parentRels[k]);
} }
strcat(q,")"); strcat(q,")");
} }
switch(tblinfo[i].relarch[0]) { switch(tblinfo[i].relarch[0]) {
case 'n': case 'n':
archiveMode = "none"; archiveMode = "none";
break; break;
case 'h': case 'h':
archiveMode = "heavy"; archiveMode = "heavy";
break; break;
case 'l': case 'l':
archiveMode = "light"; archiveMode = "light";
break; break;
default: default:
fprintf(stderr, "unknown archive mode\n"); fprintf(stderr, "unknown archive mode\n");
archiveMode = "none"; archiveMode = "none";
break; break;
} }
sprintf(q, "%s archive = %s;\n", sprintf(q, "%s archive = %s;\n",
q, q,
archiveMode); archiveMode);
fputs(q,fout); fputs(q,fout);
} }
} }
} }
...@@ -1304,7 +1535,7 @@ void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables, ...@@ -1304,7 +1535,7 @@ void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables,
*/ */
void void
dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices, dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices,
TableInfo* tblinfo, int numTables, const char *tablename) TableInfo* tblinfo, int numTables, const char *tablename)
{ {
int i; int i;
int tableInd; int tableInd;
...@@ -1316,193 +1547,50 @@ dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices, ...@@ -1316,193 +1547,50 @@ dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices,
PGresult *res; PGresult *res;
for (i=0;i<numIndices;i++) { for (i=0;i<numIndices;i++) {
tableInd = findTableByName(tblinfo, numTables, tableInd = findTableByName(tblinfo, numTables,
indinfo[i].indrelname); indinfo[i].indrelname);
indkey = atoi(indinfo[i].indkey) - 1; indkey = atoi(indinfo[i].indkey) - 1;
if (indkey == ObjectIdAttributeNumber - 1) if (indkey == ObjectIdAttributeNumber - 1)
attname = "oid"; attname = "oid";
else else
attname = tblinfo[tableInd].attnames[indkey]; attname = tblinfo[tableInd].attnames[indkey];
if (strcmp(indinfo[i].indproc,"0") == 0) { if (strcmp(indinfo[i].indproc,"0") == 0) {
funcname = NULL; funcname = NULL;
} else { } else {
/* the funcname is an oid which we use to /* the funcname is an oid which we use to
find the name of the pg_proc. We need to do this find the name of the pg_proc. We need to do this
because getFuncs() only reads in the user-defined funcs because getFuncs() only reads in the user-defined funcs
not all the funcs. We might not find what we want not all the funcs. We might not find what we want
by looking in FuncInfo**/ by looking in FuncInfo**/
sprintf(q, sprintf(q,
"SELECT proname from pg_proc where pg_proc.oid = '%s'::oid", "SELECT proname from pg_proc "
indinfo[i].indproc); "where pg_proc.oid = '%s'::oid",
res = PQexec(g_conn, q); indinfo[i].indproc);
funcname = strdup(PQgetvalue(res, 0, res = PQexec(g_conn, q);
PQfnumber(res,"proname"))); funcname = strdup(PQgetvalue(res, 0,
PQclear(res); PQfnumber(res,"proname")));
} PQclear(res);
}
if (!tablename || (!strcmp(indinfo[i].indrelname,tablename))) { if (!tablename || (!strcmp(indinfo[i].indrelname,tablename))) {
sprintf(q,"CREATE INDEX %s on %s using %s (", sprintf(q,"CREATE INDEX %s on %s using %s (",
indinfo[i].indexrelname, indinfo[i].indexrelname,
indinfo[i].indrelname, indinfo[i].indrelname,
indinfo[i].indamname); indinfo[i].indamname);
if (funcname) { if (funcname) {
sprintf(q, "%s %s(%s) %s);\n", sprintf(q, "%s %s(%s) %s);\n",
q,funcname, attname, indinfo[i].indclassname); q,funcname, attname, indinfo[i].indclassname);
free(funcname); free(funcname);
} else } else
sprintf(q, "%s %s %s);\n", sprintf(q, "%s %s %s);\n",
q,attname,indinfo[i].indclassname); q,attname,indinfo[i].indclassname);
fputs(q,fout); fputs(q,fout);
} }
} }
} }
/*
* DumpClasses -
* dump the contents of all the classes.
*/
void
dumpClasses(TableInfo *tblinfo, int numTables, FILE *fout, const char *onlytable, int oids)
{
char query[255];
#define COPYBUFSIZ 8192
char copybuf[COPYBUFSIZ];
char expandbuf[COPYBUFSIZ];
char *expsrc,*expdest;
char q[MAXQUERYLEN];
PGresult *res;
int i,j;
int actual_atts; /* number of attrs in this a table */
int ret;
int field;
int tuple;
int copydone;
for(i = 0; i < numTables; i++) {
char *classname = tblinfo[i].relname;
if (!onlytable || (!strcmp(classname,onlytable))) {
/* skip archive names*/
if (isArchiveName(classname))
continue;
if(!dumpData) {
if (oids) {
fprintf(fout, "COPY %s WITH OIDS FROM stdin;\n", classname);
sprintf(query, "COPY %s WITH OIDS TO stdout;\n", classname);
}
else {
fprintf(fout, "COPY %s FROM stdin;\n", classname);
sprintf(query, "COPY %s TO stdout;\n", classname);
}
res = PQexec(g_conn, query);
if (!res ||
PQresultStatus(res) != PGRES_COPY_OUT) {
fprintf(stderr,"dumpClasses(): COPY to stdout failed");
exit_nicely(g_conn);
}
copydone = 0;
while (!copydone) {
ret = PQgetline(res->conn, copybuf, COPYBUFSIZ);
if (copybuf[0] == '\\' &&
copybuf[1] == '.' &&
copybuf[2] == '\0') {
copydone = true; /* don't print this... */
} else {
fputs(copybuf, fout);
switch (ret) {
case EOF:
copydone = true;
/*FALLTHROUGH*/
case 0:
fputc('\n', fout);
break;
case 1:
break;
}
}
}
fprintf(fout, "\\.\n");
PQclear(res);
PQendcopy(res->conn);
} else {
sprintf(query, "select * from %s;\n", classname);
res = PQexec(g_conn, query);
if (!res ||
PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"dumpClasses(): command failed");
exit_nicely(g_conn);
}
tuple=0;
while(tuple < PQntuples(res)) {
fprintf(fout, "insert into %s ", classname);
if (attrNames) {
actual_atts = 0;
sprintf(q, "(");
for (j=0;j<tblinfo[i].numatts;j++) {
if (tblinfo[i].inhAttrs[j] == 0) {
sprintf(q, "%s%s%s",
q,
(actual_atts > 0) ? "," : "",
tblinfo[i].attnames[j]);
actual_atts++;
}
}
sprintf(q,"%s%s",q, ") ");
fprintf(fout, q);
}
fprintf(fout, "values (");
field=0;
do {
if (PQgetisnull(res,tuple,field)) {
fprintf(fout,"NULL");
}
else {
switch(PQftype(res,field)) {
case 21: case 22: case 23: /* int types */
case 810: case 910: /* oldint types */
case 1005: case 1006: case 1007: /* _int types */
case 700: case 701: /* float types */
case 1021: case 1022: /* _float types */
fprintf(fout, "%s", PQgetvalue(res,tuple,field));
break;
default:
/* Before outputing string value, expand all
single quotes to twin single quotes -
dhb - 6/11/96 */
expsrc=PQgetvalue(res,tuple,field);
expdest=expandbuf;
while (*expsrc) {
*expdest++=*expsrc;
if (*expsrc == (char)0x27) /*sing. quote*/
*expdest++ = *expsrc;
expsrc++;
}
*expdest=*expsrc; /* null term. */
fprintf(fout, "'%s'", expandbuf);
break;
}
}
field++;
if(field != PQnfields(res))
fprintf(fout, ",");
} while(field < PQnfields(res));
fprintf(fout, ");\n");
tuple++;
}
PQclear(res);
}
}
}
}
/* /*
* dumpTuples -- * dumpTuples --
* prints out the tuples in ASCII representation. The output is a valid * prints out the tuples in ASCII representation. The output is a valid
...@@ -1526,35 +1614,35 @@ dumpTuples(PGresult *res, FILE *fout, int* attrmap) ...@@ -1526,35 +1614,35 @@ dumpTuples(PGresult *res, FILE *fout, int* attrmap)
m = PQnfields(res); m = PQnfields(res);
if ( m > 0 ) { if ( m > 0 ) {
/* /*
* Print out the tuples but only print tuples with at least * Print out the tuples but only print tuples with at least
* 1 field. * 1 field.
*/ */
outVals = (char**)malloc(m * sizeof(char*)); outVals = (char**)malloc(m * sizeof(char*));
for (j = 0; j < n; j++) { for (j = 0; j < n; j++) {
for (k = 0; k < m; k++) { for (k = 0; k < m; k++) {
outVals[attrmap[k]] = PQgetvalue(res, j, k); outVals[attrmap[k]] = PQgetvalue(res, j, k);
} }
for (k = 0; k < m; k++) { for (k = 0; k < m; k++) {
char *pval = outVals[k]; char *pval = outVals[k];
if (k!=0) if (k!=0)
fputc('\t', fout); /* delimiter for attribute */ fputc('\t', fout); /* delimiter for attribute */
if (pval) { if (pval) {
while (*pval != '\0') { while (*pval != '\0') {
/* escape tabs, newlines and backslashes */ /* escape tabs, newlines and backslashes */
if (*pval=='\t' || *pval=='\n' || *pval=='\\') if (*pval=='\t' || *pval=='\n' || *pval=='\\')
fputc('\\', fout); fputc('\\', fout);
fputc(*pval, fout); fputc(*pval, fout);
pval++; pval++;
} }
} }
} }
fputc('\n', fout); /* delimiter for a tuple */ fputc('\n', fout); /* delimiter for a tuple */
} }
free (outVals); free (outVals);
} }
} }
...@@ -1597,13 +1685,13 @@ setMaxOid(FILE *fout) ...@@ -1597,13 +1685,13 @@ setMaxOid(FILE *fout)
PQclear(res); PQclear(res);
if (g_verbose) if (g_verbose)
fprintf(stderr, "%s maximum system oid is %d %s\n", fprintf(stderr, "%s maximum system oid is %d %s\n",
g_comment_start, max_oid, g_comment_end); g_comment_start, max_oid, g_comment_end);
fprintf(fout, "CREATE TABLE pgdump_oid (dummy int4);\n"); fprintf(fout, "CREATE TABLE pgdump_oid (dummy int4);\n");
fprintf(fout, "COPY pgdump_oid WITH OIDS FROM stdin;\n"); fprintf(fout, "COPY pgdump_oid WITH OIDS FROM stdin;\n");
fprintf(fout, "%-d\t0\n", max_oid); fprintf(fout, "%-d\t0\n", max_oid);
fprintf(fout, "\\.\n"); fprintf(fout, "\\.\n");
fprintf(fout, "DROP TABLE pgdump_oid;\n"); fprintf(fout, "DROP TABLE pgdump_oid;\n");
} }
/* /*
* findLastBuiltInOid - * findLastBuiltInOid -
...@@ -1615,25 +1703,26 @@ setMaxOid(FILE *fout) ...@@ -1615,25 +1703,26 @@ setMaxOid(FILE *fout)
int int
findLastBuiltinOid(void) findLastBuiltinOid(void)
{ {
PGresult* res; PGresult* res;
int ntups; int ntups;
int last_oid; int last_oid;
res = PQexec(g_conn, res = PQexec(g_conn,
"SELECT oid from pg_database where datname = 'template1';"); "SELECT oid from pg_database where datname = 'template1';");
if (res == NULL || if (res == NULL ||
PQresultStatus(res) != PGRES_TUPLES_OK) { PQresultStatus(res) != PGRES_TUPLES_OK) {
fprintf(stderr,"pg_dump error in finding the template1 database"); fprintf(stderr,"pg_dump error in finding the template1 database\n");
exit_nicely(g_conn); exit_nicely(g_conn);
} }
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) { if (ntups != 1) {
fprintf(stderr,"pg_dump: couldn't find the template1 database. You are really hosed\nGiving up\n"); fprintf(stderr,"pg_dump: couldn't find the template1 database. "
exit_nicely(g_conn); "You are really hosed.\nGiving up.\n");
} exit_nicely(g_conn);
last_oid = atoi(PQgetvalue(res, 0, PQfnumber(res, "oid"))); }
PQclear(res); last_oid = atoi(PQgetvalue(res, 0, PQfnumber(res, "oid")));
return last_oid; PQclear(res);
return last_oid;
} }
...@@ -1654,11 +1743,11 @@ checkForQuote(const char* s) ...@@ -1654,11 +1743,11 @@ checkForQuote(const char* s)
while ( (c = *s) != '\0') { while ( (c = *s) != '\0') {
if (c == '\'') { if (c == '\'') {
r[j++] = '\''; /* quote the single quotes */ r[j++] = '\''; /* quote the single quotes */
} }
r[j++] = c; r[j++] = c;
s++; s++;
} }
r[j] = '\0'; r[j] = '\0';
......
src/bin/pg_dump/pg_dump.h
View file @ 15526ff0
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_dump.h,v 1.8 1996/11/26 03:19:49 bryanh Exp $ * $Id: pg_dump.h,v 1.9 1996/12/27 23:12:57 bryanh Exp $
* *
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
* *
...@@ -122,7 +122,7 @@ typedef struct _oprInfo { ...@@ -122,7 +122,7 @@ typedef struct _oprInfo {
/* global decls */ /* global decls */
extern int g_verbose; /* verbose flag */ extern bool g_verbose; /* verbose flag */
extern int g_last_builtin_oid; /* value of the last builtin oid */ extern int g_last_builtin_oid; /* value of the last builtin oid */
extern FILE *g_fout; /* the script file */ extern FILE *g_fout; /* the script file */
...@@ -189,8 +189,6 @@ extern void dumpTables(FILE* fout, TableInfo* tbinfo, int numTables, ...@@ -189,8 +189,6 @@ extern void dumpTables(FILE* fout, TableInfo* tbinfo, int numTables,
extern void dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices, extern void dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices,
TableInfo* tbinfo, int numTables, const char *tablename); TableInfo* tbinfo, int numTables, const char *tablename);
extern void dumpClasses(TableInfo *tbinfo, int numTables, FILE *fout,
const char *tablename, int oids);
extern void dumpTuples(PGresult *res, FILE *fout, int *attrmap); extern void dumpTuples(PGresult *res, FILE *fout, int *attrmap);
extern void setMaxOid(FILE *fout); extern void setMaxOid(FILE *fout);
extern char* checkForQuote(const char* s); extern char* checkForQuote(const char* s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment