projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define the measurement, alignment and role enums in a way compatible with Gtk
[pspp]
/
src
/
data
/
psql-reader.c
diff --git
a/src/data/psql-reader.c
b/src/data/psql-reader.c
index 2d9a2678086380725b8cb812305f5682373e8bf0..630a720711ce14af83784137085cd8cb72f57ab2 100644
(file)
--- a/
src/data/psql-reader.c
+++ b/
src/data/psql-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2010, 2011
, 2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-32,8
+32,9
@@
#include "libpspp/misc.h"
#include "libpspp/str.h"
#include "libpspp/misc.h"
#include "libpspp/str.h"
-#include "gl/
xalloc
.h"
+#include "gl/
c-strcase
.h"
#include "gl/minmax.h"
#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-270,7
+271,7
@@
psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
{
const char *dt = PQparameterStatus (r->conn, "integer_datetimes");
{
const char *dt = PQparameterStatus (r->conn, "integer_datetimes");
- r->integer_datetimes = ( 0 == strcasecmp (dt, "on"));
+ r->integer_datetimes = ( 0 ==
c_
strcasecmp (dt, "on"));
}
#if USE_SSL
}
#if USE_SSL
@@
-297,10
+298,10
@@
psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
if we find this value.
*/
encoding = enc ? pg_encoding_to_char (enc) : get_default_encoding ();
if we find this value.
*/
encoding = enc ? pg_encoding_to_char (enc) : get_default_encoding ();
- }
- /* Create the dictionary and populate it */
- *dict = r->dict = dict_create ();
+ /* Create the dictionary and populate it */
+ *dict = r->dict = dict_create (encoding);
+ }
/*
select count (*) from (select * from medium) stupid_sql_standard;
/*
select count (*) from (select * from medium) stupid_sql_standard;