From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 29 Mar 2009 23:05:22 +0000 (+0800)
Subject: Set the dictionary's encoding when reading postgresql data.
X-Git-Tag: v0.7.3~191
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=d48951817bd0d243601dfc794a5f10b52bfbc938

Set the dictionary's encoding when reading postgresql data.
---

diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c
index a54b9f8b..f2d5ff28 100644
--- a/src/data/psql-reader.c
+++ b/src/data/psql-reader.c
@@ -288,10 +288,22 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
   /* Create the dictionary and populate it */
   *dict = r->dict = dict_create ();
 
+  {
+    const int enc = PQclientEncoding (r->conn);
+
+    /* According to section 22.2 of the Postgresql manual
+       a value of zero (SQL_ASCII) indicates
+       "a declaration of ignorance about the encoding".
+       Accordingly, we don't set the dictionary's encoding
+       if we find this value.
+    */
+    if ( enc != 0 )
+      dict_set_encoding (r->dict, pg_encoding_to_char (enc));
+  }
+
   /*
     select count (*) from (select * from medium) stupid_sql_standard;
   */
-
   ds_init_cstr (&query,
 		"BEGIN READ ONLY ISOLATION LEVEL SERIALIZABLE; "
 		"DECLARE  pspp BINARY CURSOR FOR ");