pg 0.18.1 → 1.5.6
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/.appveyor.yml +42 -0
- data/.gems +6 -0
- data/.github/workflows/binary-gems.yml +117 -0
- data/.github/workflows/source-gem.yml +141 -0
- data/.gitignore +22 -0
- data/.hgsigs +34 -0
- data/.hgtags +41 -0
- data/.irbrc +23 -0
- data/.pryrc +23 -0
- data/.tm_properties +21 -0
- data/.travis.yml +49 -0
- data/BSDL +2 -2
- data/Gemfile +17 -0
- data/History.md +901 -0
- data/Manifest.txt +8 -21
- data/README-Windows.rdoc +17 -28
- data/README.ja.md +300 -0
- data/README.md +286 -0
- data/Rakefile +43 -131
- data/Rakefile.cross +89 -70
- data/certs/ged.pem +24 -0
- data/certs/kanis@comcard.de.pem +20 -0
- data/certs/larskanis-2022.pem +26 -0
- data/certs/larskanis-2023.pem +24 -0
- data/certs/larskanis-2024.pem +24 -0
- data/ext/errorcodes.def +113 -0
- data/ext/errorcodes.rb +1 -1
- data/ext/errorcodes.txt +36 -2
- data/ext/extconf.rb +128 -55
- data/ext/gvl_wrappers.c +8 -0
- data/ext/gvl_wrappers.h +44 -33
- data/ext/pg.c +228 -202
- data/ext/pg.h +108 -99
- data/ext/pg_binary_decoder.c +164 -16
- data/ext/pg_binary_encoder.c +249 -22
- data/ext/pg_coder.c +189 -44
- data/ext/pg_connection.c +1889 -1195
- data/ext/pg_copy_coder.c +398 -42
- data/ext/pg_errors.c +1 -1
- data/ext/pg_record_coder.c +522 -0
- data/ext/pg_result.c +729 -234
- data/ext/pg_text_decoder.c +635 -52
- data/ext/pg_text_encoder.c +294 -130
- data/ext/pg_tuple.c +572 -0
- data/ext/pg_type_map.c +64 -23
- data/ext/pg_type_map_all_strings.c +21 -7
- data/ext/pg_type_map_by_class.c +59 -27
- data/ext/pg_type_map_by_column.c +86 -43
- data/ext/pg_type_map_by_mri_type.c +50 -21
- data/ext/pg_type_map_by_oid.c +62 -29
- data/ext/pg_type_map_in_ruby.c +59 -28
- data/ext/{util.c → pg_util.c} +13 -13
- data/ext/{util.h → pg_util.h} +3 -3
- data/lib/pg/basic_type_map_based_on_result.rb +67 -0
- data/lib/pg/basic_type_map_for_queries.rb +202 -0
- data/lib/pg/basic_type_map_for_results.rb +104 -0
- data/lib/pg/basic_type_registry.rb +303 -0
- data/lib/pg/binary_decoder/date.rb +9 -0
- data/lib/pg/binary_decoder/timestamp.rb +26 -0
- data/lib/pg/binary_encoder/timestamp.rb +20 -0
- data/lib/pg/coder.rb +36 -13
- data/lib/pg/connection.rb +813 -74
- data/lib/pg/exceptions.rb +16 -2
- data/lib/pg/result.rb +24 -7
- data/lib/pg/text_decoder/date.rb +18 -0
- data/lib/pg/text_decoder/inet.rb +9 -0
- data/lib/pg/text_decoder/json.rb +14 -0
- data/lib/pg/text_decoder/numeric.rb +9 -0
- data/lib/pg/text_decoder/timestamp.rb +30 -0
- data/lib/pg/text_encoder/date.rb +12 -0
- data/lib/pg/text_encoder/inet.rb +28 -0
- data/lib/pg/text_encoder/json.rb +14 -0
- data/lib/pg/text_encoder/numeric.rb +9 -0
- data/lib/pg/text_encoder/timestamp.rb +24 -0
- data/lib/pg/tuple.rb +30 -0
- data/lib/pg/type_map_by_column.rb +3 -2
- data/lib/pg/version.rb +4 -0
- data/lib/pg.rb +106 -41
- data/misc/openssl-pg-segfault.rb +31 -0
- data/misc/postgres/History.txt +9 -0
- data/misc/postgres/Manifest.txt +5 -0
- data/misc/postgres/README.txt +21 -0
- data/misc/postgres/Rakefile +21 -0
- data/misc/postgres/lib/postgres.rb +16 -0
- data/misc/ruby-pg/History.txt +9 -0
- data/misc/ruby-pg/Manifest.txt +5 -0
- data/misc/ruby-pg/README.txt +21 -0
- data/misc/ruby-pg/Rakefile +21 -0
- data/misc/ruby-pg/lib/ruby/pg.rb +16 -0
- data/pg.gemspec +34 -0
- data/rakelib/task_extension.rb +46 -0
- data/sample/array_insert.rb +1 -1
- data/sample/async_api.rb +4 -8
- data/sample/async_copyto.rb +1 -1
- data/sample/async_mixed.rb +1 -1
- data/sample/check_conn.rb +1 -1
- data/sample/copydata.rb +71 -0
- data/sample/copyfrom.rb +1 -1
- data/sample/copyto.rb +1 -1
- data/sample/cursor.rb +1 -1
- data/sample/disk_usage_report.rb +6 -15
- data/sample/issue-119.rb +2 -2
- data/sample/losample.rb +1 -1
- data/sample/minimal-testcase.rb +2 -2
- data/sample/notify_wait.rb +1 -1
- data/sample/pg_statistics.rb +6 -15
- data/sample/replication_monitor.rb +9 -18
- data/sample/test_binary_values.rb +1 -1
- data/sample/wal_shipper.rb +2 -2
- data/sample/warehouse_partitions.rb +8 -17
- data.tar.gz.sig +0 -0
- metadata +135 -207
- metadata.gz.sig +0 -0
- data/ChangeLog +0 -5378
- data/History.rdoc +0 -297
- data/README.ja.rdoc +0 -14
- data/README.rdoc +0 -161
- data/lib/pg/basic_type_mapping.rb +0 -399
- data/lib/pg/constants.rb +0 -11
- data/lib/pg/text_decoder.rb +0 -42
- data/lib/pg/text_encoder.rb +0 -27
- data/spec/data/expected_trace.out +0 -26
- data/spec/data/random_binary_data +0 -0
- data/spec/helpers.rb +0 -355
- data/spec/pg/basic_type_mapping_spec.rb +0 -251
- data/spec/pg/connection_spec.rb +0 -1459
- data/spec/pg/result_spec.rb +0 -449
- data/spec/pg/type_map_by_class_spec.rb +0 -138
- data/spec/pg/type_map_by_column_spec.rb +0 -222
- data/spec/pg/type_map_by_mri_type_spec.rb +0 -136
- data/spec/pg/type_map_by_oid_spec.rb +0 -149
- data/spec/pg/type_map_in_ruby_spec.rb +0 -164
- data/spec/pg/type_map_spec.rb +0 -22
- data/spec/pg/type_spec.rb +0 -665
- data/spec/pg_spec.rb +0 -50
data/ext/pg_type_map_in_ruby.c
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* pg_type_map_in_ruby.c - PG::TypeMapInRuby class extension
|
3
|
-
* $Id
|
3
|
+
* $Id$
|
4
4
|
*
|
5
5
|
*/
|
6
6
|
|
@@ -19,6 +19,33 @@ typedef struct {
|
|
19
19
|
VALUE self;
|
20
20
|
} t_tmir;
|
21
21
|
|
22
|
+
static size_t
|
23
|
+
pg_tmir_memsize( const void *_this )
|
24
|
+
{
|
25
|
+
const t_tmir *this = (const t_tmir *)_this;
|
26
|
+
return sizeof(*this);
|
27
|
+
}
|
28
|
+
|
29
|
+
static void
|
30
|
+
pg_tmir_compact( void *_this )
|
31
|
+
{
|
32
|
+
t_tmir *this = (t_tmir *)_this;
|
33
|
+
pg_typemap_compact(&this->typemap);
|
34
|
+
pg_gc_location(this->self);
|
35
|
+
}
|
36
|
+
|
37
|
+
static const rb_data_type_t pg_tmir_type = {
|
38
|
+
"PG::TypeMapInRuby",
|
39
|
+
{
|
40
|
+
pg_typemap_mark,
|
41
|
+
RUBY_TYPED_DEFAULT_FREE,
|
42
|
+
pg_tmir_memsize,
|
43
|
+
pg_compact_callback(pg_tmir_compact),
|
44
|
+
},
|
45
|
+
&pg_typemap_type,
|
46
|
+
0,
|
47
|
+
RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | PG_RUBY_TYPED_FROZEN_SHAREABLE,
|
48
|
+
};
|
22
49
|
|
23
50
|
/*
|
24
51
|
* call-seq:
|
@@ -34,33 +61,37 @@ typedef struct {
|
|
34
61
|
static VALUE
|
35
62
|
pg_tmir_fit_to_result( VALUE self, VALUE result )
|
36
63
|
{
|
37
|
-
t_tmir *this =
|
64
|
+
t_tmir *this = RTYPEDDATA_DATA( self );
|
38
65
|
t_typemap *default_tm;
|
39
66
|
t_typemap *p_new_typemap;
|
40
67
|
VALUE sub_typemap;
|
41
68
|
VALUE new_typemap;
|
42
69
|
|
43
70
|
if( rb_respond_to(self, s_id_fit_to_result) ){
|
71
|
+
t_typemap *tm;
|
72
|
+
UNUSED(tm);
|
44
73
|
new_typemap = rb_funcall( self, s_id_fit_to_result, 1, result );
|
45
74
|
|
46
75
|
if ( !rb_obj_is_kind_of(new_typemap, rb_cTypeMap) ) {
|
76
|
+
/* TypedData_Get_Struct() raises "wrong argument type", which is misleading,
|
77
|
+
* so we better raise our own message */
|
47
78
|
rb_raise( rb_eTypeError, "wrong return type from fit_to_result: %s expected kind of PG::TypeMap",
|
48
79
|
rb_obj_classname( new_typemap ) );
|
49
80
|
}
|
50
|
-
|
81
|
+
TypedData_Get_Struct(new_typemap, t_typemap, &pg_typemap_type, tm);
|
51
82
|
} else {
|
52
83
|
new_typemap = self;
|
53
84
|
}
|
54
85
|
|
55
|
-
/* Ensure that the default type map fits
|
56
|
-
default_tm =
|
86
|
+
/* Ensure that the default type map fits equally. */
|
87
|
+
default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
|
57
88
|
sub_typemap = default_tm->funcs.fit_to_result( this->typemap.default_typemap, result );
|
58
89
|
|
59
90
|
if( sub_typemap != this->typemap.default_typemap ){
|
60
91
|
new_typemap = rb_obj_dup( new_typemap );
|
61
92
|
}
|
62
93
|
|
63
|
-
p_new_typemap =
|
94
|
+
p_new_typemap = RTYPEDDATA_DATA(new_typemap);
|
64
95
|
p_new_typemap->default_typemap = sub_typemap;
|
65
96
|
return new_typemap;
|
66
97
|
}
|
@@ -95,8 +126,8 @@ pg_tmir_result_value( t_typemap *p_typemap, VALUE result, int tuple, int field )
|
|
95
126
|
static VALUE
|
96
127
|
pg_tmir_typecast_result_value( VALUE self, VALUE result, VALUE tuple, VALUE field )
|
97
128
|
{
|
98
|
-
t_tmir *this =
|
99
|
-
t_typemap *default_tm =
|
129
|
+
t_tmir *this = RTYPEDDATA_DATA( self );
|
130
|
+
t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
|
100
131
|
return default_tm->funcs.typecast_result_value( default_tm, result, NUM2INT(tuple), NUM2INT(field) );
|
101
132
|
}
|
102
133
|
|
@@ -113,15 +144,15 @@ pg_tmir_typecast_result_value( VALUE self, VALUE result, VALUE tuple, VALUE fiel
|
|
113
144
|
static VALUE
|
114
145
|
pg_tmir_fit_to_query( VALUE self, VALUE params )
|
115
146
|
{
|
116
|
-
t_tmir *this =
|
147
|
+
t_tmir *this = RTYPEDDATA_DATA( self );
|
117
148
|
t_typemap *default_tm;
|
118
149
|
|
119
150
|
if( rb_respond_to(self, s_id_fit_to_query) ){
|
120
151
|
rb_funcall( self, s_id_fit_to_query, 1, params );
|
121
152
|
}
|
122
153
|
|
123
|
-
/* Ensure that the default type map fits
|
124
|
-
default_tm =
|
154
|
+
/* Ensure that the default type map fits equally. */
|
155
|
+
default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
|
125
156
|
default_tm->funcs.fit_to_query( this->typemap.default_typemap, params );
|
126
157
|
|
127
158
|
return self;
|
@@ -137,7 +168,7 @@ pg_tmir_query_param( t_typemap *p_typemap, VALUE param_value, int field )
|
|
137
168
|
if ( NIL_P(coder) ){
|
138
169
|
return NULL;
|
139
170
|
} else if( rb_obj_is_kind_of(coder, rb_cPG_Coder) ) {
|
140
|
-
return
|
171
|
+
return RTYPEDDATA_DATA(coder);
|
141
172
|
} else {
|
142
173
|
rb_raise( rb_eTypeError, "wrong return type from typecast_query_param: %s expected nil or kind of PG::Coder",
|
143
174
|
rb_obj_classname( coder ) );
|
@@ -161,8 +192,8 @@ pg_tmir_query_param( t_typemap *p_typemap, VALUE param_value, int field )
|
|
161
192
|
static VALUE
|
162
193
|
pg_tmir_typecast_query_param( VALUE self, VALUE param_value, VALUE field )
|
163
194
|
{
|
164
|
-
t_tmir *this =
|
165
|
-
t_typemap *default_tm =
|
195
|
+
t_tmir *this = RTYPEDDATA_DATA( self );
|
196
|
+
t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
|
166
197
|
t_pg_coder *p_coder = default_tm->funcs.typecast_query_param( default_tm, param_value, NUM2INT(field) );
|
167
198
|
|
168
199
|
return p_coder ? p_coder->coder_obj : Qnil;
|
@@ -179,6 +210,9 @@ pg_tmir_typecast_query_param( VALUE self, VALUE param_value, VALUE field )
|
|
179
210
|
* This method is called, when a type map is used for decoding copy data,
|
180
211
|
* before the value is casted.
|
181
212
|
*
|
213
|
+
* Should return the expected number of columns or 0 if the number of columns is unknown.
|
214
|
+
* This number is only used for memory pre-allocation.
|
215
|
+
*
|
182
216
|
*/
|
183
217
|
static VALUE pg_tmir_fit_to_copy_get_dummy( VALUE self ){}
|
184
218
|
#endif
|
@@ -186,7 +220,7 @@ static VALUE pg_tmir_fit_to_copy_get_dummy( VALUE self ){}
|
|
186
220
|
static int
|
187
221
|
pg_tmir_fit_to_copy_get( VALUE self )
|
188
222
|
{
|
189
|
-
t_tmir *this =
|
223
|
+
t_tmir *this = RTYPEDDATA_DATA( self );
|
190
224
|
t_typemap *default_tm;
|
191
225
|
VALUE num_columns = INT2NUM(0);
|
192
226
|
|
@@ -198,8 +232,8 @@ pg_tmir_fit_to_copy_get( VALUE self )
|
|
198
232
|
rb_raise( rb_eTypeError, "wrong return type from fit_to_copy_get: %s expected kind of Integer",
|
199
233
|
rb_obj_classname( num_columns ) );
|
200
234
|
}
|
201
|
-
/* Ensure that the default type map fits
|
202
|
-
default_tm =
|
235
|
+
/* Ensure that the default type map fits equally. */
|
236
|
+
default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
|
203
237
|
default_tm->funcs.fit_to_copy_get( this->typemap.default_typemap );
|
204
238
|
|
205
239
|
return NUM2INT(num_columns);;
|
@@ -212,12 +246,9 @@ pg_tmir_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, int format
|
|
212
246
|
rb_encoding *p_encoding = rb_enc_from_index(enc_idx);
|
213
247
|
VALUE enc = rb_enc_from_encoding(p_encoding);
|
214
248
|
/* field_str is reused in-place by pg_text_dec_copy_row(), so we need to make
|
215
|
-
* a copy of the string buffer
|
216
|
-
|
217
|
-
|
218
|
-
VALUE field_str_copy = rb_str_new(RSTRING_PTR(field_str), RSTRING_LEN(field_str));
|
219
|
-
PG_ENCODING_SET_NOCHECK(field_str_copy, ENCODING_GET(field_str));
|
220
|
-
OBJ_INFECT(field_str_copy, field_str);
|
249
|
+
* a copy of the string buffer for use in ruby space. */
|
250
|
+
VALUE field_str_copy = rb_str_dup(field_str);
|
251
|
+
rb_str_modify(field_str_copy);
|
221
252
|
|
222
253
|
return rb_funcall( this->self, s_id_typecast_copy_get, 4, field_str_copy, INT2NUM(fieldno), INT2NUM(format), enc );
|
223
254
|
}
|
@@ -242,8 +273,8 @@ pg_tmir_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, int format
|
|
242
273
|
static VALUE
|
243
274
|
pg_tmir_typecast_copy_get( VALUE self, VALUE field_str, VALUE fieldno, VALUE format, VALUE enc )
|
244
275
|
{
|
245
|
-
t_tmir *this =
|
246
|
-
t_typemap *default_tm =
|
276
|
+
t_tmir *this = RTYPEDDATA_DATA( self );
|
277
|
+
t_typemap *default_tm = RTYPEDDATA_DATA( this->typemap.default_typemap );
|
247
278
|
int enc_idx = rb_to_encoding_index( enc );
|
248
279
|
|
249
280
|
return default_tm->funcs.typecast_copy_get( default_tm, field_str, NUM2INT(fieldno), NUM2INT(format), enc_idx );
|
@@ -255,7 +286,7 @@ pg_tmir_s_allocate( VALUE klass )
|
|
255
286
|
t_tmir *this;
|
256
287
|
VALUE self;
|
257
288
|
|
258
|
-
self =
|
289
|
+
self = TypedData_Make_Struct( klass, t_tmir, &pg_tmir_type, this );
|
259
290
|
|
260
291
|
this->typemap.funcs.fit_to_result = pg_tmir_fit_to_result;
|
261
292
|
this->typemap.funcs.fit_to_query = pg_tmir_fit_to_query;
|
@@ -263,7 +294,7 @@ pg_tmir_s_allocate( VALUE klass )
|
|
263
294
|
this->typemap.funcs.typecast_result_value = pg_tmir_result_value;
|
264
295
|
this->typemap.funcs.typecast_query_param = pg_tmir_query_param;
|
265
296
|
this->typemap.funcs.typecast_copy_get = pg_tmir_copy_get;
|
266
|
-
this->typemap.default_typemap
|
297
|
+
RB_OBJ_WRITE(self, &this->typemap.default_typemap, pg_typemap_all_strings);
|
267
298
|
this->self = self;
|
268
299
|
|
269
300
|
return self;
|
@@ -271,7 +302,7 @@ pg_tmir_s_allocate( VALUE klass )
|
|
271
302
|
|
272
303
|
|
273
304
|
void
|
274
|
-
init_pg_type_map_in_ruby()
|
305
|
+
init_pg_type_map_in_ruby(void)
|
275
306
|
{
|
276
307
|
s_id_fit_to_result = rb_intern("fit_to_result");
|
277
308
|
s_id_fit_to_query = rb_intern("fit_to_query");
|
data/ext/{util.c → pg_util.c}
RENAMED
@@ -1,11 +1,11 @@
|
|
1
1
|
/*
|
2
|
-
*
|
3
|
-
* $Id
|
2
|
+
* pg_util.c - Utils for ruby-pg
|
3
|
+
* $Id$
|
4
4
|
*
|
5
5
|
*/
|
6
6
|
|
7
7
|
#include "pg.h"
|
8
|
-
#include "
|
8
|
+
#include "pg_util.h"
|
9
9
|
|
10
10
|
static const char base64_encode_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
11
11
|
|
@@ -15,19 +15,19 @@ static const char base64_encode_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijk
|
|
15
15
|
* in-place (with _out_ == _in_).
|
16
16
|
*/
|
17
17
|
void
|
18
|
-
base64_encode( char *out, char *in, int len)
|
18
|
+
base64_encode( char *out, const char *in, int len)
|
19
19
|
{
|
20
|
-
char *in_ptr = in + len;
|
20
|
+
const unsigned char *in_ptr = (const unsigned char *)in + len;
|
21
21
|
char *out_ptr = out + BASE64_ENCODED_SIZE(len);
|
22
22
|
int part_len = len % 3;
|
23
23
|
|
24
24
|
if( part_len > 0 ){
|
25
|
-
long byte2 =
|
25
|
+
long byte2 = 0;
|
26
26
|
long byte1 = part_len > 1 ? *--in_ptr : 0;
|
27
27
|
long byte0 = *--in_ptr;
|
28
28
|
long triple = (byte0 << 16) + (byte1 << 8) + byte2;
|
29
29
|
|
30
|
-
*--out_ptr =
|
30
|
+
*--out_ptr = '=';
|
31
31
|
*--out_ptr = part_len > 1 ? base64_encode_table[(triple >> 1 * 6) & 0x3F] : '=';
|
32
32
|
*--out_ptr = base64_encode_table[(triple >> 2 * 6) & 0x3F];
|
33
33
|
*--out_ptr = base64_encode_table[(triple >> 3 * 6) & 0x3F];
|
@@ -72,12 +72,12 @@ static const unsigned char base64_decode_table[] =
|
|
72
72
|
* It is possible to decode a string in-place (with _out_ == _in_).
|
73
73
|
*/
|
74
74
|
int
|
75
|
-
base64_decode( char *out, char *in, unsigned int len)
|
75
|
+
base64_decode( char *out, const char *in, unsigned int len)
|
76
76
|
{
|
77
77
|
unsigned char a, b, c, d;
|
78
|
-
unsigned char *in_ptr = (unsigned char *)in;
|
78
|
+
const unsigned char *in_ptr = (const unsigned char *)in;
|
79
79
|
unsigned char *out_ptr = (unsigned char *)out;
|
80
|
-
unsigned char *iend_ptr = (unsigned char *)in + len;
|
80
|
+
const unsigned char *iend_ptr = (unsigned char *)in + len;
|
81
81
|
|
82
82
|
for(;;){
|
83
83
|
if( in_ptr+3 < iend_ptr &&
|
@@ -91,7 +91,7 @@ base64_decode( char *out, char *in, unsigned int len)
|
|
91
91
|
*out_ptr++ = (b << 4) | (c >> 2);
|
92
92
|
*out_ptr++ = (c << 6) | d;
|
93
93
|
} else if (in_ptr < iend_ptr){
|
94
|
-
|
94
|
+
b = c = d = 0xff;
|
95
95
|
while ((a = base64_decode_table[*in_ptr++]) == 0xff && in_ptr < iend_ptr) {}
|
96
96
|
if (in_ptr < iend_ptr){
|
97
97
|
while ((b = base64_decode_table[*in_ptr++]) == 0xff && in_ptr < iend_ptr) {}
|
@@ -116,7 +116,7 @@ base64_decode( char *out, char *in, unsigned int len)
|
|
116
116
|
}
|
117
117
|
|
118
118
|
|
119
|
-
return (char*)out_ptr - out;
|
119
|
+
return (int)((char*)out_ptr - out);
|
120
120
|
}
|
121
121
|
|
122
122
|
/*
|
@@ -124,7 +124,7 @@ base64_decode( char *out, char *in, unsigned int len)
|
|
124
124
|
* At most n bytes will be examined from each string.
|
125
125
|
*/
|
126
126
|
int
|
127
|
-
|
127
|
+
rbpg_strncasecmp(const char *s1, const char *s2, size_t n)
|
128
128
|
{
|
129
129
|
while (n-- > 0)
|
130
130
|
{
|
data/ext/{util.h → pg_util.h}
RENAMED
@@ -57,9 +57,9 @@
|
|
57
57
|
#define BASE64_ENCODED_SIZE(strlen) (((strlen) + 2) / 3 * 4)
|
58
58
|
#define BASE64_DECODED_SIZE(base64len) (((base64len) + 3) / 4 * 3)
|
59
59
|
|
60
|
-
void base64_encode( char *out, char *in, int len);
|
61
|
-
int base64_decode( char *out, char *in, unsigned int len);
|
60
|
+
void base64_encode( char *out, const char *in, int len);
|
61
|
+
int base64_decode( char *out, const char *in, unsigned int len);
|
62
62
|
|
63
|
-
int
|
63
|
+
int rbpg_strncasecmp(const char *s1, const char *s2, size_t n);
|
64
64
|
|
65
65
|
#endif /* end __utils_h */
|
@@ -0,0 +1,67 @@
|
|
1
|
+
# -*- ruby -*-
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
require 'pg' unless defined?( PG )
|
5
|
+
|
6
|
+
# Simple set of rules for type casting common PostgreSQL types from Ruby
|
7
|
+
# to PostgreSQL.
|
8
|
+
#
|
9
|
+
# OIDs of supported type casts are not hard-coded in the sources, but are retrieved from the
|
10
|
+
# PostgreSQL's +pg_type+ table in PG::BasicTypeMapBasedOnResult.new .
|
11
|
+
#
|
12
|
+
# This class works equal to PG::BasicTypeMapForResults, but does not define decoders for
|
13
|
+
# the given result OIDs, but encoders. So it can be used to type cast field values based on
|
14
|
+
# the type OID retrieved by a separate SQL query.
|
15
|
+
#
|
16
|
+
# PG::TypeMapByOid#build_column_map(result) can be used to generate a result independent
|
17
|
+
# PG::TypeMapByColumn type map, which can subsequently be used to cast query bind parameters
|
18
|
+
# or #put_copy_data fields.
|
19
|
+
#
|
20
|
+
# Example:
|
21
|
+
# conn.exec( "CREATE TEMP TABLE copytable (t TEXT, i INT, ai INT[])" )
|
22
|
+
#
|
23
|
+
# # Retrieve table OIDs per empty result set.
|
24
|
+
# res = conn.exec( "SELECT * FROM copytable LIMIT 0" )
|
25
|
+
# # Build a type map for common ruby to database type encoders.
|
26
|
+
# btm = PG::BasicTypeMapBasedOnResult.new(conn)
|
27
|
+
# # Build a PG::TypeMapByColumn with encoders suitable for copytable.
|
28
|
+
# tm = btm.build_column_map( res )
|
29
|
+
# row_encoder = PG::TextEncoder::CopyRow.new type_map: tm
|
30
|
+
#
|
31
|
+
# conn.copy_data( "COPY copytable FROM STDIN", row_encoder ) do |res|
|
32
|
+
# conn.put_copy_data ['a', 123, [5,4,3]]
|
33
|
+
# end
|
34
|
+
# This inserts a single row into copytable with type casts from ruby to
|
35
|
+
# database types using text format.
|
36
|
+
#
|
37
|
+
# Very similar with binary format:
|
38
|
+
#
|
39
|
+
# conn.exec( "CREATE TEMP TABLE copytable (t TEXT, i INT, blob bytea, created_at timestamp)" )
|
40
|
+
# # Retrieve table OIDs per empty result set in binary format.
|
41
|
+
# res = conn.exec_params( "SELECT * FROM copytable LIMIT 0", [], 1 )
|
42
|
+
# # Build a type map for common ruby to database type encoders.
|
43
|
+
# btm = PG::BasicTypeMapBasedOnResult.new(conn)
|
44
|
+
# # Build a PG::TypeMapByColumn with encoders suitable for copytable.
|
45
|
+
# tm = btm.build_column_map( res )
|
46
|
+
# row_encoder = PG::BinaryEncoder::CopyRow.new type_map: tm
|
47
|
+
#
|
48
|
+
# conn.copy_data( "COPY copytable FROM STDIN WITH (FORMAT binary)", row_encoder ) do |res|
|
49
|
+
# conn.put_copy_data ['a', 123, "\xff\x00".b, Time.now]
|
50
|
+
# end
|
51
|
+
#
|
52
|
+
# This inserts a single row into copytable with type casts from ruby to
|
53
|
+
# database types using binary copy and value format.
|
54
|
+
# Binary COPY is faster than text format but less portable and less readable and pg offers fewer en-/decoders of database types.
|
55
|
+
#
|
56
|
+
class PG::BasicTypeMapBasedOnResult < PG::TypeMapByOid
|
57
|
+
include PG::BasicTypeRegistry::Checker
|
58
|
+
|
59
|
+
def initialize(connection_or_coder_maps, registry: nil)
|
60
|
+
@coder_maps = build_coder_maps(connection_or_coder_maps, registry: registry)
|
61
|
+
|
62
|
+
# Populate TypeMapByOid hash with encoders
|
63
|
+
@coder_maps.each_format(:encoder).flat_map{|f| f.coders }.each do |coder|
|
64
|
+
add_coder(coder)
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
@@ -0,0 +1,202 @@
|
|
1
|
+
# -*- ruby -*-
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
require 'pg' unless defined?( PG )
|
5
|
+
|
6
|
+
# Simple set of rules for type casting common Ruby types to PostgreSQL.
|
7
|
+
#
|
8
|
+
# OIDs of supported type casts are not hard-coded in the sources, but are retrieved from the
|
9
|
+
# PostgreSQL's pg_type table in PG::BasicTypeMapForQueries.new .
|
10
|
+
#
|
11
|
+
# Query params are type casted based on the class of the given value.
|
12
|
+
#
|
13
|
+
# Higher level libraries will most likely not make use of this class, but use their
|
14
|
+
# own derivation of PG::TypeMapByClass or another set of rules to choose suitable
|
15
|
+
# encoders and decoders for the values to be sent.
|
16
|
+
#
|
17
|
+
# Example:
|
18
|
+
# conn = PG::Connection.new
|
19
|
+
# # Assign a default ruleset for type casts of input and output values.
|
20
|
+
# conn.type_map_for_queries = PG::BasicTypeMapForQueries.new(conn)
|
21
|
+
# # Execute a query. The Integer param value is typecasted internally by PG::BinaryEncoder::Int8.
|
22
|
+
# # The format of the parameter is set to 0 (text) and the OID of this parameter is set to 20 (int8).
|
23
|
+
# res = conn.exec_params( "SELECT $1", [5] )
|
24
|
+
class PG::BasicTypeMapForQueries < PG::TypeMapByClass
|
25
|
+
# Helper class for submission of binary strings into bytea columns.
|
26
|
+
#
|
27
|
+
# Since PG::BasicTypeMapForQueries chooses the encoder to be used by the class of the submitted value,
|
28
|
+
# it's necessary to send binary strings as BinaryData.
|
29
|
+
# That way they're distinct from text strings.
|
30
|
+
# Please note however that PG::BasicTypeMapForResults delivers bytea columns as plain String
|
31
|
+
# with binary encoding.
|
32
|
+
#
|
33
|
+
# conn.type_map_for_queries = PG::BasicTypeMapForQueries.new(conn)
|
34
|
+
# conn.exec("CREATE TEMP TABLE test (data bytea)")
|
35
|
+
# bd = PG::BasicTypeMapForQueries::BinaryData.new("ab\xff\0cd")
|
36
|
+
# conn.exec_params("INSERT INTO test (data) VALUES ($1)", [bd])
|
37
|
+
class BinaryData < String
|
38
|
+
end
|
39
|
+
|
40
|
+
class UndefinedEncoder < RuntimeError
|
41
|
+
end
|
42
|
+
|
43
|
+
include PG::BasicTypeRegistry::Checker
|
44
|
+
|
45
|
+
# Create a new type map for query submission
|
46
|
+
#
|
47
|
+
# Options:
|
48
|
+
# * +registry+: Custom type registry, nil for default global registry
|
49
|
+
# * +if_undefined+: Optional +Proc+ object which is called, if no type for an parameter class is not defined in the registry.
|
50
|
+
# The +Proc+ object is called with the name and format of the missing type.
|
51
|
+
# Its return value is not used.
|
52
|
+
def initialize(connection_or_coder_maps, registry: nil, if_undefined: nil)
|
53
|
+
@coder_maps = build_coder_maps(connection_or_coder_maps, registry: registry)
|
54
|
+
@array_encoders_by_klass = array_encoders_by_klass
|
55
|
+
@encode_array_as = :array
|
56
|
+
@if_undefined = if_undefined || method(:raise_undefined_type).to_proc
|
57
|
+
init_encoders
|
58
|
+
end
|
59
|
+
|
60
|
+
private def raise_undefined_type(oid_name, format)
|
61
|
+
raise UndefinedEncoder, "no encoder defined for type #{oid_name.inspect} format #{format}"
|
62
|
+
end
|
63
|
+
|
64
|
+
# Change the mechanism that is used to encode ruby array values
|
65
|
+
#
|
66
|
+
# Possible values:
|
67
|
+
# * +:array+ : Encode the ruby array as a PostgreSQL array.
|
68
|
+
# The array element type is inferred from the class of the first array element. This is the default.
|
69
|
+
# * +:json+ : Encode the ruby array as a JSON document.
|
70
|
+
# * +:record+ : Encode the ruby array as a composite type row.
|
71
|
+
# * <code>"_type"</code> : Encode the ruby array as a particular PostgreSQL type.
|
72
|
+
# All PostgreSQL array types are supported.
|
73
|
+
# If there's an encoder registered for the elements +type+, it will be used.
|
74
|
+
# Otherwise a string conversion (by +value.to_s+) is done.
|
75
|
+
def encode_array_as=(pg_type)
|
76
|
+
case pg_type
|
77
|
+
when :array
|
78
|
+
when :json
|
79
|
+
when :record
|
80
|
+
when /\A_/
|
81
|
+
else
|
82
|
+
raise ArgumentError, "invalid pg_type #{pg_type.inspect}"
|
83
|
+
end
|
84
|
+
|
85
|
+
@encode_array_as = pg_type
|
86
|
+
|
87
|
+
init_encoders
|
88
|
+
end
|
89
|
+
|
90
|
+
attr_reader :encode_array_as
|
91
|
+
|
92
|
+
private
|
93
|
+
|
94
|
+
def init_encoders
|
95
|
+
coders.each { |kl, c| self[kl] = nil } # Clear type map
|
96
|
+
populate_encoder_list
|
97
|
+
@textarray_encoder = coder_by_name(0, :encoder, '_text')
|
98
|
+
end
|
99
|
+
|
100
|
+
def coder_by_name(format, direction, name)
|
101
|
+
check_format_and_direction(format, direction)
|
102
|
+
@coder_maps.map_for(format, direction).coder_by_name(name)
|
103
|
+
end
|
104
|
+
|
105
|
+
def undefined(name, format)
|
106
|
+
@if_undefined.call(name, format)
|
107
|
+
end
|
108
|
+
|
109
|
+
def populate_encoder_list
|
110
|
+
DEFAULT_TYPE_MAP.each do |klass, selector|
|
111
|
+
if Array === selector
|
112
|
+
format, name, oid_name = selector
|
113
|
+
coder = coder_by_name(format, :encoder, name).dup
|
114
|
+
if coder
|
115
|
+
if oid_name
|
116
|
+
oid_coder = coder_by_name(format, :encoder, oid_name)
|
117
|
+
if oid_coder
|
118
|
+
coder.oid = oid_coder.oid
|
119
|
+
else
|
120
|
+
undefined(oid_name, format)
|
121
|
+
end
|
122
|
+
else
|
123
|
+
coder.oid = 0
|
124
|
+
end
|
125
|
+
self[klass] = coder
|
126
|
+
else
|
127
|
+
undefined(name, format)
|
128
|
+
end
|
129
|
+
else
|
130
|
+
|
131
|
+
case @encode_array_as
|
132
|
+
when :array
|
133
|
+
self[klass] = selector
|
134
|
+
when :json
|
135
|
+
self[klass] = PG::TextEncoder::JSON.new
|
136
|
+
when :record
|
137
|
+
self[klass] = PG::TextEncoder::Record.new type_map: self
|
138
|
+
when /\A_/
|
139
|
+
coder = coder_by_name(0, :encoder, @encode_array_as)
|
140
|
+
if coder
|
141
|
+
self[klass] = coder
|
142
|
+
else
|
143
|
+
undefined(@encode_array_as, format)
|
144
|
+
end
|
145
|
+
else
|
146
|
+
raise ArgumentError, "invalid pg_type #{@encode_array_as.inspect}"
|
147
|
+
end
|
148
|
+
end
|
149
|
+
end
|
150
|
+
end
|
151
|
+
|
152
|
+
def array_encoders_by_klass
|
153
|
+
DEFAULT_ARRAY_TYPE_MAP.inject({}) do |h, (klass, (format, name))|
|
154
|
+
h[klass] = coder_by_name(format, :encoder, name)
|
155
|
+
h
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
def get_array_type(value)
|
160
|
+
elem = value
|
161
|
+
while elem.kind_of?(Array)
|
162
|
+
elem = elem.first
|
163
|
+
end
|
164
|
+
@array_encoders_by_klass[elem.class] ||
|
165
|
+
elem.class.ancestors.lazy.map{|ancestor| @array_encoders_by_klass[ancestor] }.find{|a| a } ||
|
166
|
+
@textarray_encoder
|
167
|
+
end
|
168
|
+
|
169
|
+
begin
|
170
|
+
require "bigdecimal"
|
171
|
+
has_bigdecimal = true
|
172
|
+
rescue LoadError
|
173
|
+
end
|
174
|
+
|
175
|
+
DEFAULT_TYPE_MAP = PG.make_shareable({
|
176
|
+
TrueClass => [1, 'bool', 'bool'],
|
177
|
+
FalseClass => [1, 'bool', 'bool'],
|
178
|
+
# We use text format and no type OID for numbers, because setting the OID can lead
|
179
|
+
# to unnecessary type conversions on server side.
|
180
|
+
Integer => [0, 'int8'],
|
181
|
+
Float => [0, 'float8'],
|
182
|
+
Time => [0, 'timestamptz'],
|
183
|
+
# We use text format and no type OID for IPAddr, because setting the OID can lead
|
184
|
+
# to unnecessary inet/cidr conversions on the server side.
|
185
|
+
IPAddr => [0, 'inet'],
|
186
|
+
Hash => [0, 'json'],
|
187
|
+
Array => :get_array_type,
|
188
|
+
BinaryData => [1, 'bytea'],
|
189
|
+
}.merge(has_bigdecimal ? {BigDecimal => [0, 'numeric']} : {}))
|
190
|
+
private_constant :DEFAULT_TYPE_MAP
|
191
|
+
|
192
|
+
DEFAULT_ARRAY_TYPE_MAP = PG.make_shareable({
|
193
|
+
TrueClass => [0, '_bool'],
|
194
|
+
FalseClass => [0, '_bool'],
|
195
|
+
Integer => [0, '_int8'],
|
196
|
+
String => [0, '_text'],
|
197
|
+
Float => [0, '_float8'],
|
198
|
+
Time => [0, '_timestamptz'],
|
199
|
+
IPAddr => [0, '_inet'],
|
200
|
+
}.merge(has_bigdecimal ? {BigDecimal => [0, '_numeric']} : {}))
|
201
|
+
private_constant :DEFAULT_ARRAY_TYPE_MAP
|
202
|
+
end
|
@@ -0,0 +1,104 @@
|
|
1
|
+
# -*- ruby -*-
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
require 'pg' unless defined?( PG )
|
5
|
+
|
6
|
+
# Simple set of rules for type casting common PostgreSQL types to Ruby.
|
7
|
+
#
|
8
|
+
# OIDs of supported type casts are not hard-coded in the sources, but are retrieved from the
|
9
|
+
# PostgreSQL's +pg_type+ table in PG::BasicTypeMapForResults.new .
|
10
|
+
#
|
11
|
+
# Result values are type casted based on the type OID of the given result column.
|
12
|
+
#
|
13
|
+
# Higher level libraries will most likely not make use of this class, but use their
|
14
|
+
# own set of rules to choose suitable encoders and decoders.
|
15
|
+
#
|
16
|
+
# Example:
|
17
|
+
# conn = PG::Connection.new
|
18
|
+
# # Assign a default ruleset for type casts of output values.
|
19
|
+
# conn.type_map_for_results = PG::BasicTypeMapForResults.new(conn)
|
20
|
+
# # Execute a query.
|
21
|
+
# res = conn.exec_params( "SELECT $1::INT", ['5'] )
|
22
|
+
# # Retrieve and cast the result value. Value format is 0 (text) and OID is 20. Therefore typecasting
|
23
|
+
# # is done by PG::TextDecoder::Integer internally for all value retrieval methods.
|
24
|
+
# res.values # => [[5]]
|
25
|
+
#
|
26
|
+
# PG::TypeMapByOid#build_column_map(result) can be used to generate
|
27
|
+
# a result independent PG::TypeMapByColumn type map, which can subsequently be used
|
28
|
+
# to cast #get_copy_data fields:
|
29
|
+
#
|
30
|
+
# For the following table:
|
31
|
+
# conn.exec( "CREATE TABLE copytable AS VALUES('a', 123, '{5,4,3}'::INT[])" )
|
32
|
+
#
|
33
|
+
# # Retrieve table OIDs per empty result set.
|
34
|
+
# res = conn.exec( "SELECT * FROM copytable LIMIT 0" )
|
35
|
+
# # Build a type map for common database to ruby type decoders.
|
36
|
+
# btm = PG::BasicTypeMapForResults.new(conn)
|
37
|
+
# # Build a PG::TypeMapByColumn with decoders suitable for copytable.
|
38
|
+
# tm = btm.build_column_map( res )
|
39
|
+
# row_decoder = PG::TextDecoder::CopyRow.new type_map: tm
|
40
|
+
#
|
41
|
+
# conn.copy_data( "COPY copytable TO STDOUT", row_decoder ) do |res|
|
42
|
+
# while row=conn.get_copy_data
|
43
|
+
# p row
|
44
|
+
# end
|
45
|
+
# end
|
46
|
+
# This prints the rows with type casted columns:
|
47
|
+
# ["a", 123, [5, 4, 3]]
|
48
|
+
#
|
49
|
+
# Very similar with binary format:
|
50
|
+
#
|
51
|
+
# conn.exec( "CREATE TABLE copytable AS VALUES('a', 123, '2023-03-19 18:39:44'::TIMESTAMP)" )
|
52
|
+
#
|
53
|
+
# # Retrieve table OIDs per empty result set in binary format.
|
54
|
+
# res = conn.exec_params( "SELECT * FROM copytable LIMIT 0", [], 1 )
|
55
|
+
# # Build a type map for common database to ruby type decoders.
|
56
|
+
# btm = PG::BasicTypeMapForResults.new(conn)
|
57
|
+
# # Build a PG::TypeMapByColumn with decoders suitable for copytable.
|
58
|
+
# tm = btm.build_column_map( res )
|
59
|
+
# row_decoder = PG::BinaryDecoder::CopyRow.new type_map: tm
|
60
|
+
#
|
61
|
+
# conn.copy_data( "COPY copytable TO STDOUT WITH (FORMAT binary)", row_decoder ) do |res|
|
62
|
+
# while row=conn.get_copy_data
|
63
|
+
# p row
|
64
|
+
# end
|
65
|
+
# end
|
66
|
+
# This prints the rows with type casted columns:
|
67
|
+
# ["a", 123, 2023-03-19 18:39:44 UTC]
|
68
|
+
#
|
69
|
+
# See also PG::BasicTypeMapBasedOnResult for the encoder direction and PG::BasicTypeRegistry for the definition of additional types.
|
70
|
+
class PG::BasicTypeMapForResults < PG::TypeMapByOid
|
71
|
+
include PG::BasicTypeRegistry::Checker
|
72
|
+
|
73
|
+
class WarningTypeMap < PG::TypeMapInRuby
|
74
|
+
def initialize(typenames)
|
75
|
+
@already_warned = {}
|
76
|
+
@typenames_by_oid = typenames
|
77
|
+
end
|
78
|
+
|
79
|
+
def typecast_result_value(result, _tuple, field)
|
80
|
+
format = result.fformat(field)
|
81
|
+
oid = result.ftype(field)
|
82
|
+
unless @already_warned.dig(format, oid)
|
83
|
+
warn "Warning: no type cast defined for type #{@typenames_by_oid[oid].inspect} format #{format} with oid #{oid}. Please cast this type explicitly to TEXT to be safe for future changes."
|
84
|
+
unless frozen?
|
85
|
+
@already_warned[format] ||= {}
|
86
|
+
@already_warned[format][oid] = true
|
87
|
+
end
|
88
|
+
end
|
89
|
+
super
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
def initialize(connection_or_coder_maps, registry: nil)
|
94
|
+
@coder_maps = build_coder_maps(connection_or_coder_maps, registry: registry)
|
95
|
+
|
96
|
+
# Populate TypeMapByOid hash with decoders
|
97
|
+
@coder_maps.each_format(:decoder).flat_map{|f| f.coders }.each do |coder|
|
98
|
+
add_coder(coder)
|
99
|
+
end
|
100
|
+
|
101
|
+
typenames = @coder_maps.typenames_by_oid
|
102
|
+
self.default_type_map = WarningTypeMap.new(typenames)
|
103
|
+
end
|
104
|
+
end
|