PSQL READER: Use the REPEATABLE READ isolation level.

Apparently SERIALIZABLE doesn't work if the server is in
"hot standby" mode.

diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c
index 630a720711ce14af83784137085cd8cb72f57ab2..a8eb91ef7c8da5eb1696de7de0d8573a69df46d8 100644 (file)
--- a/src/data/psql-reader.c
+++ b/src/data/psql-reader.c
@@ -252,7 +252,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
     }
 
   {
-    int ver_num;
+    int ver_num = 0;
     const char *vers = PQparameterStatus (r->conn, "server_version");
 
     sscanf (vers, "%d", &ver_num);
@@ -303,12 +303,17 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
     *dict = r->dict = dict_create (encoding);
   }
 
+  const int version = PQserverVersion (r->conn);
+  ds_init_empty (&query);
   /*
-    select count (*) from (select * from medium) stupid_sql_standard;
-  */
-  ds_init_cstr (&query,
-               "BEGIN READ ONLY ISOLATION LEVEL SERIALIZABLE; "
-               "DECLARE  pspp BINARY CURSOR FOR ");
+    Versions before 9.1 don't have the REPEATABLE READ isolation level.
+    However according to <a12321aabb@gmail.com> if the server is in the
+    "hot standby" mode then SERIALIZABLE won't work.
+   */
+  ds_put_c_format (&query,
+                  "BEGIN READ ONLY ISOLATION LEVEL %s; "
+                  "DECLARE  pspp BINARY CURSOR FOR ",
+                  (version < 90100) ? "SERIALIZABLE" : "REPEATABLE READ");
 
   ds_put_substring (&query, info->sql.ss);