aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2012-05-10 09:11:38 +0200
committerMagnus Hagander <magnus@hagander.net>2012-05-10 09:12:26 +0200
commitf33c5d471ccdf33ac413d49b32a898eeab13538b (patch)
tree373ee2de4da101e274f31b39125b70224d2d3b83
parent60a3dffb724c49c60d9ba921929bfa49ec21dd00 (diff)
downloadpostgresql-f33c5d471ccdf33ac413d49b32a898eeab13538b.tar.gz
postgresql-f33c5d471ccdf33ac413d49b32a898eeab13538b.zip
Only attempt to show collations on servers >= 9.1.
Show a proper error message instead of a SQL error. Josh Kupershmidt
-rw-r--r--src/bin/psql/describe.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 8dfb5705ce4..2cfacd34e38 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3061,6 +3061,13 @@ listCollations(const char *pattern, bool verbose, bool showSystem)
printQueryOpt myopt = pset.popt;
static const bool translate_columns[] = {false, false, false, false, false};
+ if (pset.sversion < 90100)
+ {
+ fprintf(stderr, _("The server (version %d.%d) does not support collations.\n"),
+ pset.sversion / 10000, (pset.sversion / 100) % 100);
+ return true;
+ }
+
initPQExpBuffer(&buf);
printfPQExpBuffer(&buf,