pg 0.21.0 → 1.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +0 -0
- data/ChangeLog +0 -6595
- data/History.rdoc +184 -0
- data/Manifest.txt +8 -3
- data/README-Windows.rdoc +4 -4
- data/README.ja.rdoc +1 -2
- data/README.rdoc +58 -13
- data/Rakefile +10 -9
- data/Rakefile.cross +68 -71
- data/ext/errorcodes.def +76 -0
- data/ext/errorcodes.rb +1 -1
- data/ext/errorcodes.txt +21 -2
- data/ext/extconf.rb +18 -36
- data/ext/gvl_wrappers.c +4 -0
- data/ext/gvl_wrappers.h +23 -39
- data/ext/pg.c +154 -144
- data/ext/pg.h +68 -95
- data/ext/pg_binary_decoder.c +82 -15
- data/ext/pg_binary_encoder.c +13 -12
- data/ext/pg_coder.c +73 -12
- data/ext/pg_connection.c +699 -459
- data/ext/pg_copy_coder.c +16 -8
- data/ext/pg_record_coder.c +491 -0
- data/ext/pg_result.c +571 -195
- data/ext/pg_text_decoder.c +606 -40
- data/ext/pg_text_encoder.c +185 -54
- data/ext/pg_tuple.c +549 -0
- data/ext/pg_type_map.c +1 -1
- data/ext/pg_type_map_all_strings.c +4 -4
- data/ext/pg_type_map_by_class.c +9 -4
- data/ext/pg_type_map_by_column.c +7 -6
- data/ext/pg_type_map_by_mri_type.c +1 -1
- data/ext/pg_type_map_by_oid.c +3 -2
- data/ext/pg_type_map_in_ruby.c +1 -1
- data/ext/{util.c → pg_util.c} +10 -10
- data/ext/{util.h → pg_util.h} +2 -2
- data/lib/pg.rb +8 -10
- data/lib/pg/basic_type_mapping.rb +121 -25
- data/lib/pg/binary_decoder.rb +23 -0
- data/lib/pg/coder.rb +23 -2
- data/lib/pg/connection.rb +28 -4
- data/lib/pg/constants.rb +2 -1
- data/lib/pg/exceptions.rb +2 -1
- data/lib/pg/result.rb +14 -2
- data/lib/pg/text_decoder.rb +21 -26
- data/lib/pg/text_encoder.rb +32 -8
- data/lib/pg/tuple.rb +30 -0
- data/lib/pg/type_map_by_column.rb +3 -2
- data/spec/helpers.rb +61 -33
- data/spec/pg/basic_type_mapping_spec.rb +362 -37
- data/spec/pg/connection_spec.rb +602 -329
- data/spec/pg/connection_sync_spec.rb +41 -0
- data/spec/pg/result_spec.rb +242 -17
- data/spec/pg/tuple_spec.rb +333 -0
- data/spec/pg/type_map_by_class_spec.rb +2 -2
- data/spec/pg/type_map_by_column_spec.rb +6 -2
- data/spec/pg/type_map_by_mri_type_spec.rb +1 -1
- data/spec/pg/type_map_by_oid_spec.rb +3 -3
- data/spec/pg/type_map_in_ruby_spec.rb +1 -1
- data/spec/pg/type_map_spec.rb +1 -1
- data/spec/pg/type_spec.rb +364 -18
- data/spec/pg_spec.rb +2 -2
- metadata +48 -43
- metadata.gz.sig +0 -0
- data/lib/pg/deprecated_constants.rb +0 -21
data/ext/pg.h
CHANGED
@@ -18,89 +18,18 @@
|
|
18
18
|
|
19
19
|
/* Ruby headers */
|
20
20
|
#include "ruby.h"
|
21
|
-
#
|
22
|
-
#
|
23
|
-
#elif HAVE_ST_H
|
24
|
-
# include "st.h"
|
25
|
-
#endif
|
21
|
+
#include "ruby/st.h"
|
22
|
+
#include "ruby/encoding.h"
|
26
23
|
|
27
|
-
#
|
28
|
-
# include "ruby/encoding.h"
|
29
|
-
# define M17N_SUPPORTED
|
30
|
-
# ifdef HAVE_RB_ENCDB_ALIAS
|
31
|
-
extern int rb_encdb_alias(const char *, const char *);
|
32
|
-
# define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
|
33
|
-
# elif HAVE_RB_ENC_ALIAS
|
34
|
-
extern int rb_enc_alias(const char *, const char *);
|
35
|
-
# define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
|
36
|
-
# else
|
37
|
-
extern int rb_enc_alias(const char *alias, const char *orig); /* declaration missing in Ruby 1.9.1 */
|
38
|
-
# define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
|
39
|
-
# endif
|
40
|
-
|
41
|
-
|
42
|
-
# if !defined(ENCODING_SET_INLINED)
|
43
|
-
/* Rubinius doesn't define ENCODING_SET_INLINED, so we fall back to the more
|
44
|
-
* portable version.
|
45
|
-
*/
|
46
|
-
# define PG_ENCODING_SET_NOCHECK(obj,i) \
|
47
|
-
do { \
|
48
|
-
rb_enc_set_index((obj), (i)); \
|
49
|
-
} while(0)
|
50
|
-
# else
|
51
|
-
# define PG_ENCODING_SET_NOCHECK(obj,i) \
|
24
|
+
#define PG_ENCODING_SET_NOCHECK(obj,i) \
|
52
25
|
do { \
|
53
26
|
if ((i) < ENCODING_INLINE_MAX) \
|
54
27
|
ENCODING_SET_INLINED((obj), (i)); \
|
55
28
|
else \
|
56
29
|
rb_enc_set_index((obj), (i)); \
|
57
30
|
} while(0)
|
58
|
-
# endif
|
59
|
-
|
60
|
-
#else
|
61
|
-
# define PG_ENCODING_SET_NOCHECK(obj,i) /* nothing */
|
62
|
-
#endif
|
63
|
-
|
64
|
-
#if RUBY_VM != 1
|
65
|
-
# define RUBY_18_COMPAT
|
66
|
-
#endif
|
67
|
-
|
68
|
-
#ifndef RARRAY_LEN
|
69
|
-
# define RARRAY_LEN(x) RARRAY((x))->len
|
70
|
-
#endif /* RARRAY_LEN */
|
71
|
-
|
72
|
-
#ifndef RSTRING_LEN
|
73
|
-
# define RSTRING_LEN(x) RSTRING((x))->len
|
74
|
-
#endif /* RSTRING_LEN */
|
75
31
|
|
76
|
-
#
|
77
|
-
# define RSTRING_PTR(x) RSTRING((x))->ptr
|
78
|
-
#endif /* RSTRING_PTR */
|
79
|
-
|
80
|
-
#ifndef StringValuePtr
|
81
|
-
# define StringValuePtr(x) STR2CSTR(x)
|
82
|
-
#endif /* StringValuePtr */
|
83
|
-
|
84
|
-
#ifdef RUBY_18_COMPAT
|
85
|
-
# define rb_io_stdio_file GetWriteFile
|
86
|
-
# include "rubyio.h"
|
87
|
-
#else
|
88
|
-
# include "ruby/io.h"
|
89
|
-
#endif
|
90
|
-
|
91
|
-
#ifdef RUBINIUS
|
92
|
-
/* Workaround for wrong FIXNUM_MAX definition */
|
93
|
-
typedef intptr_t native_int;
|
94
|
-
#endif
|
95
|
-
|
96
|
-
#ifndef RETURN_SIZED_ENUMERATOR
|
97
|
-
#define RETURN_SIZED_ENUMERATOR(obj, argc, argv, size_fn) RETURN_ENUMERATOR((obj), (argc), (argv))
|
98
|
-
#endif
|
99
|
-
|
100
|
-
#ifndef HAVE_RB_HASH_DUP
|
101
|
-
/* Rubinius doesn't define rb_hash_dup() */
|
102
|
-
#define rb_hash_dup(tuple) rb_funcall((tuple), rb_intern("dup"), 0)
|
103
|
-
#endif
|
32
|
+
#include "ruby/io.h"
|
104
33
|
|
105
34
|
#ifndef timeradd
|
106
35
|
#define timeradd(a, b, result) \
|
@@ -145,6 +74,12 @@ typedef long suseconds_t;
|
|
145
74
|
#define PG_MAX_COLUMNS 4000
|
146
75
|
#endif
|
147
76
|
|
77
|
+
#ifndef RARRAY_AREF
|
78
|
+
#define RARRAY_AREF(a, i) (RARRAY_PTR(a)[i])
|
79
|
+
#endif
|
80
|
+
|
81
|
+
#define PG_ENC_IDX_BITS 28
|
82
|
+
|
148
83
|
/* The data behind each PG::Connection object */
|
149
84
|
typedef struct {
|
150
85
|
PGconn *pgconn;
|
@@ -161,13 +96,19 @@ typedef struct {
|
|
161
96
|
VALUE type_map_for_results;
|
162
97
|
/* IO object internally used for the trace stream */
|
163
98
|
VALUE trace_stream;
|
164
|
-
/* Cached Encoding object */
|
165
|
-
VALUE external_encoding;
|
166
99
|
/* Kind of PG::Coder object for casting ruby values to COPY rows */
|
167
100
|
VALUE encoder_for_put_copy_data;
|
168
101
|
/* Kind of PG::Coder object for casting COPY rows to ruby values */
|
169
102
|
VALUE decoder_for_get_copy_data;
|
103
|
+
/* Ruby encoding index of the client/internal encoding */
|
104
|
+
int enc_idx : PG_ENC_IDX_BITS;
|
105
|
+
/* flags controlling Symbol/String field names */
|
106
|
+
unsigned int flags : 2;
|
170
107
|
|
108
|
+
#if defined(_WIN32)
|
109
|
+
/* File descriptor to be used for rb_w32_unwrap_io_handle() */
|
110
|
+
int ruby_sd;
|
111
|
+
#endif
|
171
112
|
} t_pg_connection;
|
172
113
|
|
173
114
|
typedef struct pg_coder t_pg_coder;
|
@@ -188,20 +129,32 @@ typedef struct {
|
|
188
129
|
*/
|
189
130
|
t_typemap *p_typemap;
|
190
131
|
|
132
|
+
/* Ruby encoding index of the client/internal encoding */
|
133
|
+
int enc_idx : PG_ENC_IDX_BITS;
|
134
|
+
|
191
135
|
/* 0 = PGresult is cleared by PG::Result#clear or by the GC
|
192
136
|
* 1 = PGresult is cleared internally by libpq
|
193
137
|
*/
|
194
|
-
int autoclear;
|
138
|
+
unsigned int autoclear : 1;
|
139
|
+
|
140
|
+
/* flags controlling Symbol/String field names */
|
141
|
+
unsigned int flags : 2;
|
195
142
|
|
196
143
|
/* Number of fields in fnames[] .
|
197
144
|
* Set to -1 if fnames[] is not yet initialized.
|
198
145
|
*/
|
199
146
|
int nfields;
|
200
147
|
|
148
|
+
/* Size of PGresult as published to ruby memory management. */
|
149
|
+
ssize_t result_size;
|
150
|
+
|
201
151
|
/* Prefilled tuple Hash with fnames[] as keys. */
|
202
152
|
VALUE tuple_hash;
|
203
153
|
|
204
|
-
/*
|
154
|
+
/* Hash with fnames[] to field number mapping. */
|
155
|
+
VALUE field_map;
|
156
|
+
|
157
|
+
/* List of field names as frozen String or Symbol objects.
|
205
158
|
* Only valid if nfields != -1
|
206
159
|
*/
|
207
160
|
VALUE fnames[0];
|
@@ -209,7 +162,7 @@ typedef struct {
|
|
209
162
|
|
210
163
|
|
211
164
|
typedef int (* t_pg_coder_enc_func)(t_pg_coder *, VALUE, char *, VALUE *, int);
|
212
|
-
typedef VALUE (* t_pg_coder_dec_func)(t_pg_coder *, char *, int, int, int, int);
|
165
|
+
typedef VALUE (* t_pg_coder_dec_func)(t_pg_coder *, const char *, int, int, int, int);
|
213
166
|
typedef VALUE (* t_pg_fit_to_result)(VALUE, VALUE);
|
214
167
|
typedef VALUE (* t_pg_fit_to_query)(VALUE, VALUE);
|
215
168
|
typedef int (* t_pg_fit_to_copy_get)(VALUE);
|
@@ -217,12 +170,27 @@ typedef VALUE (* t_pg_typecast_result)(t_typemap *, VALUE, int, int);
|
|
217
170
|
typedef t_pg_coder *(* t_pg_typecast_query_param)(t_typemap *, VALUE, int);
|
218
171
|
typedef VALUE (* t_pg_typecast_copy_get)( t_typemap *, VALUE, int, int, int );
|
219
172
|
|
173
|
+
#define PG_RESULT_FIELD_NAMES_MASK 0x03
|
174
|
+
#define PG_RESULT_FIELD_NAMES_SYMBOL 0x01
|
175
|
+
#define PG_RESULT_FIELD_NAMES_STATIC_SYMBOL 0x02
|
176
|
+
|
177
|
+
#define PG_CODER_TIMESTAMP_DB_UTC 0x0
|
178
|
+
#define PG_CODER_TIMESTAMP_DB_LOCAL 0x1
|
179
|
+
#define PG_CODER_TIMESTAMP_APP_UTC 0x0
|
180
|
+
#define PG_CODER_TIMESTAMP_APP_LOCAL 0x2
|
181
|
+
#define PG_CODER_FORMAT_ERROR_MASK 0xc
|
182
|
+
#define PG_CODER_FORMAT_ERROR_TO_RAISE 0x4
|
183
|
+
#define PG_CODER_FORMAT_ERROR_TO_STRING 0x8
|
184
|
+
#define PG_CODER_FORMAT_ERROR_TO_PARTIAL 0xc
|
185
|
+
|
220
186
|
struct pg_coder {
|
221
187
|
t_pg_coder_enc_func enc_func;
|
222
188
|
t_pg_coder_dec_func dec_func;
|
223
189
|
VALUE coder_obj;
|
224
190
|
Oid oid;
|
225
191
|
int format;
|
192
|
+
/* OR-ed values out of PG_CODER_* */
|
193
|
+
int flags;
|
226
194
|
};
|
227
195
|
|
228
196
|
typedef struct {
|
@@ -259,6 +227,7 @@ typedef struct {
|
|
259
227
|
* Globals
|
260
228
|
**************************************************************************/
|
261
229
|
|
230
|
+
extern int pg_skip_deprecation_warning;
|
262
231
|
extern VALUE rb_mPG;
|
263
232
|
extern VALUE rb_ePGerror;
|
264
233
|
extern VALUE rb_eServerError;
|
@@ -317,13 +286,15 @@ void init_pg_type_map_by_oid _(( void ));
|
|
317
286
|
void init_pg_type_map_in_ruby _(( void ));
|
318
287
|
void init_pg_coder _(( void ));
|
319
288
|
void init_pg_copycoder _(( void ));
|
289
|
+
void init_pg_recordcoder _(( void ));
|
320
290
|
void init_pg_text_encoder _(( void ));
|
321
291
|
void init_pg_text_decoder _(( void ));
|
322
292
|
void init_pg_binary_encoder _(( void ));
|
323
293
|
void init_pg_binary_decoder _(( void ));
|
294
|
+
void init_pg_tuple _(( void ));
|
324
295
|
VALUE lookup_error_class _(( const char * ));
|
325
|
-
VALUE pg_bin_dec_bytea _(( t_pg_coder*, char *, int, int, int, int ));
|
326
|
-
VALUE pg_text_dec_string _(( t_pg_coder*, char *, int, int, int, int ));
|
296
|
+
VALUE pg_bin_dec_bytea _(( t_pg_coder*, const char *, int, int, int, int ));
|
297
|
+
VALUE pg_text_dec_string _(( t_pg_coder*, const char *, int, int, int, int ));
|
327
298
|
int pg_coder_enc_to_s _(( t_pg_coder*, VALUE, char *, VALUE *, int));
|
328
299
|
int pg_text_enc_identifier _(( t_pg_coder*, VALUE, char *, VALUE *, int));
|
329
300
|
t_pg_coder_enc_func pg_coder_enc_func _(( t_pg_coder* ));
|
@@ -333,6 +304,7 @@ VALUE pg_obj_to_i _(( VALUE ));
|
|
333
304
|
VALUE pg_tmbc_allocate _(( void ));
|
334
305
|
void pg_coder_init_encoder _(( VALUE ));
|
335
306
|
void pg_coder_init_decoder _(( VALUE ));
|
307
|
+
void pg_coder_mark _(( t_pg_coder * ));
|
336
308
|
char *pg_rb_str_ensure_capa _(( VALUE, long, char *, char ** ));
|
337
309
|
|
338
310
|
#define PG_RB_STR_ENSURE_CAPA( str, expand_len, curr_ptr, end_ptr ) \
|
@@ -346,11 +318,6 @@ char *pg_rb_str_ensure_capa _(( VALUE, long, char *,
|
|
346
318
|
(curr_ptr) = (end_ptr) = RSTRING_PTR(str) \
|
347
319
|
)
|
348
320
|
|
349
|
-
#define PG_RB_TAINTED_STR_NEW( str, curr_ptr, end_ptr ) ( \
|
350
|
-
(str) = rb_tainted_str_new( NULL, 0 ), \
|
351
|
-
(curr_ptr) = (end_ptr) = RSTRING_PTR(str) \
|
352
|
-
)
|
353
|
-
|
354
321
|
VALUE pg_typemap_fit_to_result _(( VALUE, VALUE ));
|
355
322
|
VALUE pg_typemap_fit_to_query _(( VALUE, VALUE ));
|
356
323
|
int pg_typemap_fit_to_copy_get _(( VALUE ));
|
@@ -366,6 +333,7 @@ VALUE pg_new_result_autoclear _(( PGresult *, VALUE ));
|
|
366
333
|
PGresult* pgresult_get _(( VALUE ));
|
367
334
|
VALUE pg_result_check _(( VALUE ));
|
368
335
|
VALUE pg_result_clear _(( VALUE ));
|
336
|
+
VALUE pg_tuple_new _(( VALUE, int ));
|
369
337
|
|
370
338
|
/*
|
371
339
|
* Fetch the data pointer for the result object
|
@@ -373,23 +341,28 @@ VALUE pg_result_clear _(( VALUE ));
|
|
373
341
|
static inline t_pg_result *
|
374
342
|
pgresult_get_this( VALUE self )
|
375
343
|
{
|
376
|
-
|
377
|
-
|
378
|
-
if( this == NULL )
|
379
|
-
rb_raise(rb_ePGerror, "result has been cleared");
|
380
|
-
|
381
|
-
return this;
|
344
|
+
return RTYPEDDATA_DATA(self);
|
382
345
|
}
|
383
346
|
|
384
347
|
|
385
|
-
#ifdef M17N_SUPPORTED
|
386
348
|
rb_encoding * pg_get_pg_encoding_as_rb_encoding _(( int ));
|
387
349
|
rb_encoding * pg_get_pg_encname_as_rb_encoding _(( const char * ));
|
388
350
|
const char * pg_get_rb_encoding_as_pg_encoding _(( rb_encoding * ));
|
389
351
|
rb_encoding *pg_conn_enc_get _(( PGconn * ));
|
390
|
-
#endif /* M17N_SUPPORTED */
|
391
352
|
|
392
353
|
void notice_receiver_proxy(void *arg, const PGresult *result);
|
393
354
|
void notice_processor_proxy(void *arg, const char *message);
|
394
355
|
|
356
|
+
/* reports if `-W' specified and PG_SKIP_DEPRECATION_WARNING environment variable isn't set
|
357
|
+
*
|
358
|
+
* message_id identifies the warning, so that it's reported only once.
|
359
|
+
*/
|
360
|
+
#define pg_deprecated(message_id, format_args) \
|
361
|
+
do { \
|
362
|
+
if( !(pg_skip_deprecation_warning & (1 << message_id)) ){ \
|
363
|
+
pg_skip_deprecation_warning |= 1 << message_id; \
|
364
|
+
rb_warning format_args; \
|
365
|
+
} \
|
366
|
+
} while(0);
|
367
|
+
|
395
368
|
#endif /* end __pg_h */
|
data/ext/pg_binary_decoder.c
CHANGED
@@ -1,11 +1,12 @@
|
|
1
1
|
/*
|
2
2
|
* pg_column_map.c - PG::ColumnMap class extension
|
3
|
-
* $Id
|
3
|
+
* $Id$
|
4
4
|
*
|
5
5
|
*/
|
6
6
|
|
7
|
+
#include "ruby/version.h"
|
7
8
|
#include "pg.h"
|
8
|
-
#include "
|
9
|
+
#include "pg_util.h"
|
9
10
|
#ifdef HAVE_INTTYPES_H
|
10
11
|
#include <inttypes.h>
|
11
12
|
#endif
|
@@ -16,12 +17,12 @@ VALUE rb_mPG_BinaryDecoder;
|
|
16
17
|
/*
|
17
18
|
* Document-class: PG::BinaryDecoder::Boolean < PG::SimpleDecoder
|
18
19
|
*
|
19
|
-
* This is a decoder class for conversion of PostgreSQL binary bool type
|
20
|
-
* to Ruby true or false objects.
|
20
|
+
* This is a decoder class for conversion of PostgreSQL binary +bool+ type
|
21
|
+
* to Ruby +true+ or +false+ objects.
|
21
22
|
*
|
22
23
|
*/
|
23
24
|
static VALUE
|
24
|
-
pg_bin_dec_boolean(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
|
25
|
+
pg_bin_dec_boolean(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
|
25
26
|
{
|
26
27
|
if (len < 1) {
|
27
28
|
rb_raise( rb_eTypeError, "wrong data for binary boolean converter in tuple %d field %d", tuple, field);
|
@@ -32,12 +33,12 @@ pg_bin_dec_boolean(t_pg_coder *conv, char *val, int len, int tuple, int field, i
|
|
32
33
|
/*
|
33
34
|
* Document-class: PG::BinaryDecoder::Integer < PG::SimpleDecoder
|
34
35
|
*
|
35
|
-
* This is a decoder class for conversion of PostgreSQL binary int2
|
36
|
+
* This is a decoder class for conversion of PostgreSQL binary +int2+, +int4+ and +int8+ types
|
36
37
|
* to Ruby Integer objects.
|
37
38
|
*
|
38
39
|
*/
|
39
40
|
static VALUE
|
40
|
-
pg_bin_dec_integer(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
|
41
|
+
pg_bin_dec_integer(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
|
41
42
|
{
|
42
43
|
switch( len ){
|
43
44
|
case 2:
|
@@ -54,12 +55,12 @@ pg_bin_dec_integer(t_pg_coder *conv, char *val, int len, int tuple, int field, i
|
|
54
55
|
/*
|
55
56
|
* Document-class: PG::BinaryDecoder::Float < PG::SimpleDecoder
|
56
57
|
*
|
57
|
-
* This is a decoder class for conversion of PostgreSQL binary float4 and float8 types
|
58
|
+
* This is a decoder class for conversion of PostgreSQL binary +float4+ and +float8+ types
|
58
59
|
* to Ruby Float objects.
|
59
60
|
*
|
60
61
|
*/
|
61
62
|
static VALUE
|
62
|
-
pg_bin_dec_float(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
|
63
|
+
pg_bin_dec_float(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
|
63
64
|
{
|
64
65
|
union {
|
65
66
|
float f;
|
@@ -86,15 +87,15 @@ pg_bin_dec_float(t_pg_coder *conv, char *val, int len, int tuple, int field, int
|
|
86
87
|
* Document-class: PG::BinaryDecoder::Bytea < PG::SimpleDecoder
|
87
88
|
*
|
88
89
|
* This decoder class delivers the data received from the server as binary String object.
|
89
|
-
* It is therefore suitable for conversion of PostgreSQL bytea data as well as any other
|
90
|
+
* It is therefore suitable for conversion of PostgreSQL +bytea+ data as well as any other
|
90
91
|
* data in binary format.
|
91
92
|
*
|
92
93
|
*/
|
93
94
|
VALUE
|
94
|
-
pg_bin_dec_bytea(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
|
95
|
+
pg_bin_dec_bytea(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
|
95
96
|
{
|
96
97
|
VALUE ret;
|
97
|
-
ret =
|
98
|
+
ret = rb_str_new( val, len );
|
98
99
|
PG_ENCODING_SET_NOCHECK( ret, rb_ascii8bit_encindex() );
|
99
100
|
return ret;
|
100
101
|
}
|
@@ -102,17 +103,17 @@ pg_bin_dec_bytea(t_pg_coder *conv, char *val, int len, int tuple, int field, int
|
|
102
103
|
/*
|
103
104
|
* Document-class: PG::BinaryDecoder::ToBase64 < PG::CompositeDecoder
|
104
105
|
*
|
105
|
-
* This is a decoder class for conversion of binary
|
106
|
+
* This is a decoder class for conversion of binary +bytea+ to base64 data.
|
106
107
|
*
|
107
108
|
*/
|
108
109
|
static VALUE
|
109
|
-
pg_bin_dec_to_base64(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
|
110
|
+
pg_bin_dec_to_base64(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
|
110
111
|
{
|
111
112
|
t_pg_composite_coder *this = (t_pg_composite_coder *)conv;
|
112
113
|
t_pg_coder_dec_func dec_func = pg_coder_dec_func(this->elem, this->comp.format);
|
113
114
|
int encoded_len = BASE64_ENCODED_SIZE(len);
|
114
115
|
/* create a buffer of the encoded length */
|
115
|
-
VALUE out_value =
|
116
|
+
VALUE out_value = rb_str_new(NULL, encoded_len);
|
116
117
|
|
117
118
|
base64_encode( RSTRING_PTR(out_value), val, len );
|
118
119
|
|
@@ -130,6 +131,70 @@ pg_bin_dec_to_base64(t_pg_coder *conv, char *val, int len, int tuple, int field,
|
|
130
131
|
return out_value;
|
131
132
|
}
|
132
133
|
|
134
|
+
#define PG_INT64_MIN (-0x7FFFFFFFFFFFFFFFL - 1)
|
135
|
+
#define PG_INT64_MAX 0x7FFFFFFFFFFFFFFFL
|
136
|
+
|
137
|
+
/*
|
138
|
+
* Document-class: PG::BinaryDecoder::Timestamp < PG::SimpleDecoder
|
139
|
+
*
|
140
|
+
* This is a decoder class for conversion of PostgreSQL binary timestamps
|
141
|
+
* to Ruby Time objects.
|
142
|
+
*
|
143
|
+
* The following flags can be used to specify timezone interpretation:
|
144
|
+
* * +PG::Coder::TIMESTAMP_DB_UTC+ : Interpret timestamp as UTC time (default)
|
145
|
+
* * +PG::Coder::TIMESTAMP_DB_LOCAL+ : Interpret timestamp as local time
|
146
|
+
* * +PG::Coder::TIMESTAMP_APP_UTC+ : Return timestamp as UTC time (default)
|
147
|
+
* * +PG::Coder::TIMESTAMP_APP_LOCAL+ : Return timestamp as local time
|
148
|
+
*
|
149
|
+
* Example:
|
150
|
+
* deco = PG::BinaryDecoder::Timestamp.new(flags: PG::Coder::TIMESTAMP_DB_UTC | PG::Coder::TIMESTAMP_APP_LOCAL)
|
151
|
+
* deco.decode("\0"*8) # => 2000-01-01 01:00:00 +0100
|
152
|
+
*/
|
153
|
+
static VALUE
|
154
|
+
pg_bin_dec_timestamp(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
|
155
|
+
{
|
156
|
+
int64_t timestamp;
|
157
|
+
int64_t sec;
|
158
|
+
int64_t nsec;
|
159
|
+
VALUE t;
|
160
|
+
|
161
|
+
if( len != sizeof(timestamp) ){
|
162
|
+
rb_raise( rb_eTypeError, "wrong data for timestamp converter in tuple %d field %d length %d", tuple, field, len);
|
163
|
+
}
|
164
|
+
|
165
|
+
timestamp = read_nbo64(val);
|
166
|
+
|
167
|
+
switch(timestamp){
|
168
|
+
case PG_INT64_MAX:
|
169
|
+
return rb_str_new2("infinity");
|
170
|
+
case PG_INT64_MIN:
|
171
|
+
return rb_str_new2("-infinity");
|
172
|
+
default:
|
173
|
+
/* PostgreSQL's timestamp is based on year 2000 and Ruby's time is based on 1970.
|
174
|
+
* Adjust the 30 years difference. */
|
175
|
+
sec = (timestamp / 1000000) + 10957L * 24L * 3600L;
|
176
|
+
nsec = (timestamp % 1000000) * 1000;
|
177
|
+
|
178
|
+
#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 3)) && defined(NEGATIVE_TIME_T) && defined(SIZEOF_TIME_T) && SIZEOF_TIME_T >= 8
|
179
|
+
/* Fast path for time conversion */
|
180
|
+
{
|
181
|
+
struct timespec ts = {sec, nsec};
|
182
|
+
t = rb_time_timespec_new(&ts, conv->flags & PG_CODER_TIMESTAMP_APP_LOCAL ? INT_MAX : INT_MAX-1);
|
183
|
+
}
|
184
|
+
#else
|
185
|
+
t = rb_funcall(rb_cTime, rb_intern("at"), 2, LL2NUM(sec), LL2NUM(nsec / 1000));
|
186
|
+
if( !(conv->flags & PG_CODER_TIMESTAMP_APP_LOCAL) ) {
|
187
|
+
t = rb_funcall(t, rb_intern("utc"), 0);
|
188
|
+
}
|
189
|
+
#endif
|
190
|
+
if( conv->flags & PG_CODER_TIMESTAMP_DB_LOCAL ) {
|
191
|
+
/* interpret it as local time */
|
192
|
+
t = rb_funcall(t, rb_intern("-"), 1, rb_funcall(t, rb_intern("utc_offset"), 0));
|
193
|
+
}
|
194
|
+
return t;
|
195
|
+
}
|
196
|
+
}
|
197
|
+
|
133
198
|
/*
|
134
199
|
* Document-class: PG::BinaryDecoder::String < PG::SimpleDecoder
|
135
200
|
*
|
@@ -156,6 +221,8 @@ init_pg_binary_decoder()
|
|
156
221
|
pg_define_coder( "String", pg_text_dec_string, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
|
157
222
|
/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Bytea", rb_cPG_SimpleDecoder ); */
|
158
223
|
pg_define_coder( "Bytea", pg_bin_dec_bytea, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
|
224
|
+
/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Timestamp", rb_cPG_SimpleDecoder ); */
|
225
|
+
pg_define_coder( "Timestamp", pg_bin_dec_timestamp, rb_cPG_SimpleDecoder, rb_mPG_BinaryDecoder );
|
159
226
|
|
160
227
|
/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "ToBase64", rb_cPG_CompositeDecoder ); */
|
161
228
|
pg_define_coder( "ToBase64", pg_bin_dec_to_base64, rb_cPG_CompositeDecoder, rb_mPG_BinaryDecoder );
|