sequel 5.19.0 → 5.24.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG +102 -0
- data/doc/dataset_filtering.rdoc +15 -0
- data/doc/opening_databases.rdoc +5 -1
- data/doc/release_notes/5.20.0.txt +89 -0
- data/doc/release_notes/5.21.0.txt +87 -0
- data/doc/release_notes/5.22.0.txt +48 -0
- data/doc/release_notes/5.23.0.txt +56 -0
- data/doc/release_notes/5.24.0.txt +56 -0
- data/doc/sharding.rdoc +2 -0
- data/doc/testing.rdoc +1 -0
- data/doc/transactions.rdoc +38 -0
- data/lib/sequel/adapters/ado.rb +27 -19
- data/lib/sequel/adapters/jdbc.rb +7 -1
- data/lib/sequel/adapters/jdbc/mysql.rb +2 -2
- data/lib/sequel/adapters/jdbc/postgresql.rb +1 -13
- data/lib/sequel/adapters/jdbc/sqlite.rb +29 -0
- data/lib/sequel/adapters/mysql2.rb +2 -3
- data/lib/sequel/adapters/shared/mssql.rb +7 -7
- data/lib/sequel/adapters/shared/postgres.rb +37 -19
- data/lib/sequel/adapters/shared/sqlite.rb +27 -3
- data/lib/sequel/adapters/sqlite.rb +1 -1
- data/lib/sequel/adapters/tinytds.rb +12 -0
- data/lib/sequel/adapters/utils/mysql_mysql2.rb +2 -0
- data/lib/sequel/database/logging.rb +7 -1
- data/lib/sequel/database/query.rb +1 -1
- data/lib/sequel/database/schema_generator.rb +12 -3
- data/lib/sequel/database/schema_methods.rb +2 -0
- data/lib/sequel/database/transactions.rb +57 -5
- data/lib/sequel/dataset.rb +4 -2
- data/lib/sequel/dataset/actions.rb +3 -2
- data/lib/sequel/dataset/placeholder_literalizer.rb +4 -1
- data/lib/sequel/dataset/query.rb +5 -1
- data/lib/sequel/dataset/sql.rb +11 -7
- data/lib/sequel/extensions/named_timezones.rb +52 -8
- data/lib/sequel/extensions/pg_array.rb +4 -0
- data/lib/sequel/extensions/pg_json.rb +387 -123
- data/lib/sequel/extensions/pg_range.rb +3 -2
- data/lib/sequel/extensions/pg_row.rb +3 -1
- data/lib/sequel/extensions/schema_dumper.rb +1 -1
- data/lib/sequel/extensions/server_block.rb +15 -4
- data/lib/sequel/model/associations.rb +35 -9
- data/lib/sequel/model/plugins.rb +104 -0
- data/lib/sequel/plugins/association_dependencies.rb +3 -3
- data/lib/sequel/plugins/association_pks.rb +14 -4
- data/lib/sequel/plugins/association_proxies.rb +3 -2
- data/lib/sequel/plugins/class_table_inheritance.rb +11 -0
- data/lib/sequel/plugins/composition.rb +13 -9
- data/lib/sequel/plugins/finder.rb +2 -2
- data/lib/sequel/plugins/hook_class_methods.rb +17 -5
- data/lib/sequel/plugins/insert_conflict.rb +72 -0
- data/lib/sequel/plugins/inverted_subsets.rb +2 -2
- data/lib/sequel/plugins/pg_auto_constraint_validations.rb +147 -59
- data/lib/sequel/plugins/rcte_tree.rb +6 -0
- data/lib/sequel/plugins/static_cache.rb +8 -3
- data/lib/sequel/plugins/static_cache_cache.rb +53 -0
- data/lib/sequel/plugins/subset_conditions.rb +2 -2
- data/lib/sequel/plugins/validation_class_methods.rb +5 -3
- data/lib/sequel/sql.rb +15 -3
- data/lib/sequel/timezones.rb +50 -11
- data/lib/sequel/version.rb +1 -1
- data/spec/adapters/mssql_spec.rb +24 -0
- data/spec/adapters/mysql_spec.rb +0 -5
- data/spec/adapters/postgres_spec.rb +319 -1
- data/spec/bin_spec.rb +1 -1
- data/spec/core/database_spec.rb +123 -2
- data/spec/core/dataset_spec.rb +33 -1
- data/spec/core/expression_filters_spec.rb +25 -1
- data/spec/core/schema_spec.rb +24 -0
- data/spec/extensions/class_table_inheritance_spec.rb +30 -8
- data/spec/extensions/core_refinements_spec.rb +1 -1
- data/spec/extensions/hook_class_methods_spec.rb +22 -0
- data/spec/extensions/insert_conflict_spec.rb +103 -0
- data/spec/extensions/migration_spec.rb +13 -0
- data/spec/extensions/named_timezones_spec.rb +109 -2
- data/spec/extensions/pg_auto_constraint_validations_spec.rb +45 -0
- data/spec/extensions/pg_json_spec.rb +218 -29
- data/spec/extensions/pg_range_spec.rb +76 -9
- data/spec/extensions/rcte_tree_spec.rb +6 -0
- data/spec/extensions/s_spec.rb +1 -1
- data/spec/extensions/schema_dumper_spec.rb +4 -2
- data/spec/extensions/server_block_spec.rb +38 -0
- data/spec/extensions/spec_helper.rb +8 -1
- data/spec/extensions/static_cache_cache_spec.rb +35 -0
- data/spec/integration/dataset_test.rb +25 -9
- data/spec/integration/plugin_test.rb +42 -0
- data/spec/integration/schema_test.rb +7 -2
- data/spec/integration/transaction_test.rb +50 -0
- data/spec/model/associations_spec.rb +84 -4
- data/spec/model/plugins_spec.rb +111 -0
- metadata +16 -2
@@ -1,44 +1,99 @@
|
|
1
1
|
# frozen-string-literal: true
|
2
2
|
#
|
3
3
|
# The pg_json extension adds support for Sequel to handle
|
4
|
-
# PostgreSQL's json and jsonb types.
|
5
|
-
#
|
6
|
-
#
|
7
|
-
# strings, true
|
8
|
-
#
|
9
|
-
# is fairly limited and the values do not roundtrip.
|
4
|
+
# PostgreSQL's json and jsonb types. By default, it wraps
|
5
|
+
# JSON arrays and JSON objects with ruby array-like and
|
6
|
+
# hash-like objects. If you would like to wrap JSON primitives
|
7
|
+
# (numbers, strings, +null+, +true+, and +false+), you need to
|
8
|
+
# use the +wrap_json_primitives+ setter:
|
10
9
|
#
|
11
|
-
#
|
12
|
-
#
|
13
|
-
#
|
14
|
-
#
|
15
|
-
#
|
16
|
-
#
|
17
|
-
#
|
18
|
-
#
|
19
|
-
#
|
20
|
-
#
|
21
|
-
#
|
10
|
+
# DB.extension :pg_json
|
11
|
+
# DB.wrap_json_primitives = true
|
12
|
+
#
|
13
|
+
# Note that wrapping JSON primitives changes the behavior for
|
14
|
+
# JSON false and null values. Because only +false+ and +nil+
|
15
|
+
# in Ruby are considered falesy, wrapping these objects results
|
16
|
+
# in unexpected behavior if you use the values directly in
|
17
|
+
# conditionals:
|
18
|
+
#
|
19
|
+
# if DB[:table].get(:json_column)
|
20
|
+
# # called if the value of json_column is null/false
|
21
|
+
# # if you are wrapping primitives
|
22
|
+
# end
|
23
|
+
#
|
24
|
+
# To extract the Ruby primitive object from the wrapper object,
|
25
|
+
# you can use +__getobj__+ (this comes from Ruby's delegate library).
|
22
26
|
#
|
23
|
-
# To
|
24
|
-
# use Sequel.
|
27
|
+
# To wrap an existing Ruby array, hash, string, integer, float,
|
28
|
+
# +nil+, +true+, or +false+, use +Sequel.pg_json_wrap+ or +Sequel.pg_jsonb_wrap+:
|
29
|
+
#
|
30
|
+
# Sequel.pg_json_wrap(object) # json type
|
31
|
+
# Sequel.pg_jsonb_wrap(object) # jsonb type
|
32
|
+
#
|
33
|
+
# So if you want to insert an array or hash into an json database column:
|
25
34
|
#
|
26
|
-
#
|
27
|
-
#
|
35
|
+
# DB[:table].insert(column: Sequel.pg_json_wrap([1, 2, 3]))
|
36
|
+
# DB[:table].insert(column: Sequel.pg_json_wrap({'a'=>1, 'b'=>2}))
|
37
|
+
#
|
38
|
+
# Note that the +pg_json_wrap+ and +pg_jsonb_wrap+ methods only handle Ruby primitives,
|
39
|
+
# they do not handle already wrapped objects.
|
28
40
|
#
|
29
41
|
# If you have loaded the {core_extensions extension}[rdoc-ref:doc/core_extensions.rdoc],
|
30
42
|
# or you have loaded the core_refinements extension
|
31
|
-
# and have activated refinements for the file, you can also use
|
43
|
+
# and have activated refinements for the file, you can also use the
|
44
|
+
# +pg_json+ and +pg_jsonb+ methods directly on Array or Hash:
|
32
45
|
#
|
33
|
-
# array.pg_json
|
34
|
-
#
|
46
|
+
# array.pg_json # json type
|
47
|
+
# array.pg_jsonb # jsonb type
|
35
48
|
#
|
36
|
-
#
|
49
|
+
# hash.pg_json # json type
|
50
|
+
# hash.pg_jsonb # jsonb type
|
51
|
+
#
|
52
|
+
# Model classes that use json or jsonb columns will have typecasting automatically
|
53
|
+
# setup, so you can assign Ruby primitives to model columns and have the wrapped
|
54
|
+
# objects automatically created. However, for backwards compatibility, passing
|
55
|
+
# a string object will parse the string as JSON, not create a JSON string object.
|
56
|
+
#
|
57
|
+
# obj = Model.new
|
58
|
+
# obj.json_column = {'a'=>'b'}
|
59
|
+
# obj.json_column.class
|
60
|
+
# # => Sequel::Postgres::JSONHash
|
61
|
+
# obj.json_column['a']
|
62
|
+
# # => 'b'
|
63
|
+
#
|
64
|
+
# obj.json_column = '{"a": "b"}'
|
65
|
+
# obj.json_column.class
|
66
|
+
# # => Sequel::Postgres::JSONHash
|
67
|
+
# obj.json_column['a']
|
68
|
+
# # => 'b'
|
69
|
+
#
|
70
|
+
# You can change the handling of string typecasting by using +typecast_json_strings+:
|
71
|
+
#
|
72
|
+
# DB.typecast_json_strings = true
|
73
|
+
# obj.json_column = '{"a": "b"}'
|
74
|
+
# obj.json_column.class
|
75
|
+
# # => Sequel::Postgres::JSONString
|
76
|
+
# obj.json_column
|
77
|
+
# # => '{"a": "b"}'
|
37
78
|
#
|
38
|
-
#
|
39
|
-
# DB[:table].insert(column: Sequel.pg_json({'a'=>1, 'b'=>2}))
|
79
|
+
# Note that +nil+ values are never automatically wrapped:
|
40
80
|
#
|
41
|
-
#
|
81
|
+
# obj.json_column = nil
|
82
|
+
# obj.json_column.class
|
83
|
+
# # => NilClass
|
84
|
+
# obj.json_column
|
85
|
+
# # => nil
|
86
|
+
#
|
87
|
+
# If you want to set a JSON null value when using a model, you must wrap it
|
88
|
+
# explicitly:
|
89
|
+
#
|
90
|
+
# obj.json_column = Sequel.pg_json_wrap(nil)
|
91
|
+
# obj.json_column.class
|
92
|
+
# # => Sequel::Postgres::JSONNull
|
93
|
+
# obj.json_column
|
94
|
+
# # => nil
|
95
|
+
#
|
96
|
+
# To use this extension, load it into the Database instance:
|
42
97
|
#
|
43
98
|
# DB.extension :pg_json
|
44
99
|
#
|
@@ -46,7 +101,7 @@
|
|
46
101
|
# for details on using json columns in CREATE/ALTER TABLE statements.
|
47
102
|
#
|
48
103
|
# This extension integrates with the pg_array extension. If you plan
|
49
|
-
# to use the json[]
|
104
|
+
# to use the json[] or jsonb[] types, load the pg_array extension before the
|
50
105
|
# pg_json extension:
|
51
106
|
#
|
52
107
|
# DB.extension :pg_array, :pg_json
|
@@ -54,114 +109,219 @@
|
|
54
109
|
# Note that when accessing json hashes, you should always use strings for keys.
|
55
110
|
# Attempting to use other values (such as symbols) will not work correctly.
|
56
111
|
#
|
57
|
-
# This extension requires both the json and delegate libraries.
|
112
|
+
# This extension requires both the json and delegate libraries. However, you
|
113
|
+
# can override +Sequel.parse_json+, +Sequel.object_to_json+, and
|
114
|
+
# +Sequel.json_parser_error_class+ to use an alternative JSON implementation.
|
58
115
|
#
|
59
|
-
# Related modules: Sequel::Postgres::
|
60
|
-
# Sequel::Postgres::JSONArray, Sequel::Postgres::JSONBArray, Sequel::Postgres::JSONHashBase,
|
61
|
-
# Sequel::Postgres::JSONHash, Sequel::Postgres::JSONBHash, Sequel::Postgres::JSONDatabaseMethods
|
116
|
+
# Related modules: Sequel::Postgres::JSONDatabaseMethods
|
62
117
|
|
63
118
|
require 'delegate'
|
64
119
|
require 'json'
|
65
120
|
|
66
121
|
module Sequel
|
67
122
|
module Postgres
|
68
|
-
#
|
69
|
-
|
70
|
-
include Sequel::SQL::AliasMethods
|
71
|
-
include Sequel::SQL::CastMethods
|
72
|
-
|
73
|
-
# Convert the array to a json string and append a
|
74
|
-
# literalized version of the string to the sql.
|
75
|
-
def sql_literal_append(ds, sql)
|
76
|
-
ds.literal_append(sql, Sequel.object_to_json(self))
|
77
|
-
end
|
123
|
+
# A module included in all of the JSON wrapper classes.
|
124
|
+
module JSONObject
|
78
125
|
end
|
79
126
|
|
80
|
-
|
81
|
-
|
82
|
-
def sql_literal_append(ds, sql)
|
83
|
-
super
|
84
|
-
sql << '::json'
|
85
|
-
end
|
127
|
+
# A module included in all of the JSONB wrapper classes.
|
128
|
+
module JSONBObject
|
86
129
|
end
|
87
130
|
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
131
|
+
create_delegate_class = lambda do |name, delegate_class|
|
132
|
+
base_class = DelegateClass(delegate_class)
|
133
|
+
base_class.class_eval do
|
134
|
+
include Sequel::SQL::AliasMethods
|
135
|
+
include Sequel::SQL::CastMethods
|
93
136
|
end
|
94
|
-
end
|
95
137
|
|
96
|
-
|
97
|
-
|
98
|
-
include Sequel::SQL::AliasMethods
|
99
|
-
include Sequel::SQL::CastMethods
|
138
|
+
json_class = Class.new(base_class) do
|
139
|
+
include JSONObject
|
100
140
|
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
141
|
+
def sql_literal_append(ds, sql)
|
142
|
+
ds.literal_append(sql, Sequel.object_to_json(self))
|
143
|
+
sql << '::json'
|
144
|
+
end
|
105
145
|
end
|
106
146
|
|
107
|
-
|
108
|
-
|
109
|
-
end
|
147
|
+
jsonb_class = Class.new(base_class) do
|
148
|
+
include JSONBObject
|
110
149
|
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
sql << '::json'
|
150
|
+
def sql_literal_append(ds, sql)
|
151
|
+
ds.literal_append(sql, Sequel.object_to_json(self))
|
152
|
+
sql << '::jsonb'
|
153
|
+
end
|
116
154
|
end
|
155
|
+
|
156
|
+
const_set(:"JSON#{name}Base", base_class)
|
157
|
+
const_set(:"JSON#{name}", json_class)
|
158
|
+
const_set(:"JSONB#{name}", jsonb_class)
|
117
159
|
end
|
118
160
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
161
|
+
create_delegate_class.call(:Array, Array)
|
162
|
+
create_delegate_class.call(:Hash, Hash)
|
163
|
+
create_delegate_class.call(:String, String)
|
164
|
+
create_delegate_class.call(:Integer, Integer)
|
165
|
+
create_delegate_class.call(:Float, Float)
|
166
|
+
create_delegate_class.call(:Null, NilClass)
|
167
|
+
create_delegate_class.call(:True, TrueClass)
|
168
|
+
create_delegate_class.call(:False, FalseClass)
|
169
|
+
|
170
|
+
JSON_WRAPPER_MAPPING = {
|
171
|
+
::Array => JSONArray,
|
172
|
+
::Hash => JSONHash,
|
173
|
+
}.freeze
|
174
|
+
|
175
|
+
JSONB_WRAPPER_MAPPING = {
|
176
|
+
::Array => JSONBArray,
|
177
|
+
::Hash => JSONBHash,
|
178
|
+
}.freeze
|
179
|
+
|
180
|
+
JSON_PRIMITIVE_WRAPPER_MAPPING = {
|
181
|
+
::String => JSONString,
|
182
|
+
::Integer => JSONInteger,
|
183
|
+
::Float => JSONFloat,
|
184
|
+
::NilClass => JSONNull,
|
185
|
+
::TrueClass => JSONTrue,
|
186
|
+
::FalseClass => JSONFalse,
|
187
|
+
}
|
188
|
+
|
189
|
+
JSONB_PRIMITIVE_WRAPPER_MAPPING = {
|
190
|
+
::String => JSONBString,
|
191
|
+
::Integer => JSONBInteger,
|
192
|
+
::Float => JSONBFloat,
|
193
|
+
::NilClass => JSONBNull,
|
194
|
+
::TrueClass => JSONBTrue,
|
195
|
+
::FalseClass => JSONBFalse,
|
196
|
+
}
|
197
|
+
|
198
|
+
if RUBY_VERSION < '2.4'
|
199
|
+
# :nocov:
|
200
|
+
JSON_PRIMITIVE_WRAPPER_MAPPING[Fixnum] = JSONInteger
|
201
|
+
JSON_PRIMITIVE_WRAPPER_MAPPING[Bignum] = JSONInteger
|
202
|
+
JSONB_PRIMITIVE_WRAPPER_MAPPING[Fixnum] = JSONBInteger
|
203
|
+
JSONB_PRIMITIVE_WRAPPER_MAPPING[Bignum] = JSONBInteger
|
204
|
+
# :nocov:
|
125
205
|
end
|
126
206
|
|
207
|
+
JSON_PRIMITIVE_WRAPPER_MAPPING.freeze
|
208
|
+
JSONB_PRIMITIVE_WRAPPER_MAPPING.freeze
|
209
|
+
|
210
|
+
JSON_COMBINED_WRAPPER_MAPPING =JSON_WRAPPER_MAPPING.merge(JSON_PRIMITIVE_WRAPPER_MAPPING).freeze
|
211
|
+
JSONB_COMBINED_WRAPPER_MAPPING =JSONB_WRAPPER_MAPPING.merge(JSONB_PRIMITIVE_WRAPPER_MAPPING).freeze
|
212
|
+
JSONB_WRAP_CLASSES = JSONB_COMBINED_WRAPPER_MAPPING.keys.freeze
|
213
|
+
|
214
|
+
Sequel::Deprecation.deprecate_constant(self, :JSON_WRAPPER_MAPPING)
|
215
|
+
Sequel::Deprecation.deprecate_constant(self, :JSONB_WRAPPER_MAPPING)
|
216
|
+
Sequel::Deprecation.deprecate_constant(self, :JSON_PRIMITIVE_WRAPPER_MAPPING)
|
217
|
+
Sequel::Deprecation.deprecate_constant(self, :JSONB_PRIMITIVE_WRAPPER_MAPPING)
|
218
|
+
Sequel::Deprecation.deprecate_constant(self, :JSON_COMBINED_WRAPPER_MAPPING)
|
219
|
+
Sequel::Deprecation.deprecate_constant(self, :JSONB_COMBINED_WRAPPER_MAPPING)
|
220
|
+
Sequel::Deprecation.deprecate_constant(self, :JSONB_WRAP_CLASSES)
|
221
|
+
|
222
|
+
JSON_WRAP_CLASSES = [Hash, Array, String, Integer, Float, NilClass, TrueClass, FalseClass].freeze
|
223
|
+
|
127
224
|
# Methods enabling Database object integration with the json type.
|
128
225
|
module JSONDatabaseMethods
|
129
226
|
def self.extended(db)
|
130
227
|
db.instance_exec do
|
131
|
-
add_conversion_proc(114,
|
132
|
-
add_conversion_proc(3802,
|
228
|
+
add_conversion_proc(114, method(:_db_parse_json))
|
229
|
+
add_conversion_proc(3802, method(:_db_parse_jsonb))
|
133
230
|
if respond_to?(:register_array_type)
|
134
231
|
register_array_type('json', :oid=>199, :scalar_oid=>114)
|
135
232
|
register_array_type('jsonb', :oid=>3807, :scalar_oid=>3802)
|
136
233
|
end
|
137
|
-
@schema_type_classes[:json] = [
|
138
|
-
@schema_type_classes[:jsonb] = [
|
234
|
+
@schema_type_classes[:json] = [JSONObject]
|
235
|
+
@schema_type_classes[:jsonb] = [JSONBObject]
|
139
236
|
end
|
140
237
|
end
|
141
238
|
|
142
|
-
#
|
143
|
-
|
144
|
-
|
239
|
+
# Return the wrapper class for the json type if value is Hash or Array.
|
240
|
+
def self.json_wrapper(value)
|
241
|
+
case value
|
242
|
+
when ::Hash
|
243
|
+
JSONHash
|
244
|
+
when ::Array
|
245
|
+
JSONArray
|
246
|
+
end
|
247
|
+
end
|
248
|
+
|
249
|
+
# Return the wrapper class for the jsonb type if value is Hash or Array.
|
250
|
+
def self.jsonb_wrapper(value)
|
251
|
+
case value
|
252
|
+
when ::Hash
|
253
|
+
JSONBHash
|
254
|
+
when ::Array
|
255
|
+
JSONBArray
|
256
|
+
end
|
257
|
+
end
|
258
|
+
|
259
|
+
# Return the wrapper class for the json type if value is a supported type.
|
260
|
+
def self.json_primitive_wrapper(value)
|
261
|
+
case value
|
262
|
+
when ::Hash
|
263
|
+
JSONHash
|
264
|
+
when ::Array
|
265
|
+
JSONArray
|
266
|
+
when ::String
|
267
|
+
JSONString
|
268
|
+
when ::Integer
|
269
|
+
JSONInteger
|
270
|
+
when ::Float
|
271
|
+
JSONFloat
|
272
|
+
when ::NilClass
|
273
|
+
JSONNull
|
274
|
+
when ::TrueClass
|
275
|
+
JSONTrue
|
276
|
+
when ::FalseClass
|
277
|
+
JSONFalse
|
278
|
+
end
|
279
|
+
end
|
280
|
+
|
281
|
+
# Return the wrapper class for the jsonb type if value is a supported type.
|
282
|
+
def self.jsonb_primitive_wrapper(value)
|
283
|
+
case value
|
284
|
+
when ::Hash
|
285
|
+
JSONBHash
|
286
|
+
when ::Array
|
287
|
+
JSONBArray
|
288
|
+
when ::String
|
289
|
+
JSONBString
|
290
|
+
when ::Integer
|
291
|
+
JSONBInteger
|
292
|
+
when ::Float
|
293
|
+
JSONBFloat
|
294
|
+
when ::NilClass
|
295
|
+
JSONBNull
|
296
|
+
when ::TrueClass
|
297
|
+
JSONBTrue
|
298
|
+
when ::FalseClass
|
299
|
+
JSONBFalse
|
300
|
+
end
|
301
|
+
end
|
302
|
+
|
303
|
+
# Deprecated
|
145
304
|
def self.db_parse_json(s)
|
305
|
+
# SEQUEL6: Remove
|
146
306
|
parse_json(s)
|
147
307
|
rescue Sequel::InvalidValue
|
148
308
|
raise unless s.is_a?(String)
|
149
309
|
parse_json("[#{s}]").first
|
150
310
|
end
|
151
311
|
|
152
|
-
#
|
312
|
+
# Deprecated
|
153
313
|
def self.db_parse_jsonb(s)
|
314
|
+
# SEQUEL6: Remove
|
154
315
|
parse_json(s, true)
|
155
316
|
rescue Sequel::InvalidValue
|
156
317
|
raise unless s.is_a?(String)
|
157
318
|
parse_json("[#{s}]").first
|
158
319
|
end
|
159
320
|
|
160
|
-
#
|
161
|
-
# or JSONHash instance (or JSONBArray or JSONBHash instance if jsonb
|
162
|
-
# argument is true), or a String, Numeric, true, false, or nil
|
163
|
-
# if the json library used supports that.
|
321
|
+
# Deprecated
|
164
322
|
def self.parse_json(s, jsonb=false)
|
323
|
+
# SEQUEL6: Remove
|
324
|
+
Sequel::Deprecation.deprecate("Sequel::Postgres::JSONDatabaseMethods.{parse_json,db_parse_json,db_parse_jsonb} are deprecated and will be removed in Sequel 6.")
|
165
325
|
begin
|
166
326
|
value = Sequel.parse_json(s)
|
167
327
|
rescue Sequel.json_parser_error_class => e
|
@@ -180,10 +340,22 @@ module Sequel
|
|
180
340
|
end
|
181
341
|
end
|
182
342
|
|
343
|
+
# Whether to wrap JSON primitives instead of using Ruby objects.
|
344
|
+
# Wrapping the primitives allows the primitive values to roundtrip,
|
345
|
+
# but it can cause problems, especially as false/null JSON values
|
346
|
+
# will be treated as truthy in Ruby due to the wrapping. False by
|
347
|
+
# default.
|
348
|
+
attr_accessor :wrap_json_primitives
|
349
|
+
|
350
|
+
# Whether to typecast strings for json/jsonb types as JSON
|
351
|
+
# strings, instead of trying to parse the string as JSON.
|
352
|
+
# False by default.
|
353
|
+
attr_accessor :typecast_json_strings
|
354
|
+
|
183
355
|
# Handle json and jsonb types in bound variables
|
184
356
|
def bound_variable_arg(arg, conn)
|
185
357
|
case arg
|
186
|
-
when
|
358
|
+
when JSONObject, JSONBObject
|
187
359
|
Sequel.object_to_json(arg)
|
188
360
|
else
|
189
361
|
super
|
@@ -192,10 +364,72 @@ module Sequel
|
|
192
364
|
|
193
365
|
private
|
194
366
|
|
367
|
+
# Parse JSON data coming from the database. Since PostgreSQL allows
|
368
|
+
# non JSON data in JSON fields (such as plain numbers and strings),
|
369
|
+
# we don't want to raise an exception for that.
|
370
|
+
def _db_parse_json(s)
|
371
|
+
_wrap_json(_parse_json(s))
|
372
|
+
rescue Sequel::InvalidValue
|
373
|
+
raise unless s.is_a?(String)
|
374
|
+
_wrap_json(_parse_json("[#{s}]").first)
|
375
|
+
end
|
376
|
+
|
377
|
+
# Same as _db_parse_json, but consider the input as jsonb.
|
378
|
+
def _db_parse_jsonb(s)
|
379
|
+
_wrap_jsonb(_parse_json(s))
|
380
|
+
rescue Sequel::InvalidValue
|
381
|
+
raise unless s.is_a?(String)
|
382
|
+
_wrap_jsonb(_parse_json("[#{s}]").first)
|
383
|
+
end
|
384
|
+
|
385
|
+
# Parse the given string as json, returning either a JSONArray
|
386
|
+
# or JSONHash instance (or JSONBArray or JSONBHash instance if jsonb
|
387
|
+
# argument is true), or a String, Numeric, true, false, or nil
|
388
|
+
# if the json library used supports that.
|
389
|
+
def _parse_json(s)
|
390
|
+
begin
|
391
|
+
Sequel.parse_json(s)
|
392
|
+
rescue Sequel.json_parser_error_class => e
|
393
|
+
raise Sequel.convert_exception_class(e, Sequel::InvalidValue)
|
394
|
+
end
|
395
|
+
end
|
396
|
+
|
397
|
+
# Wrap the parsed JSON value in the appropriate JSON wrapper class.
|
398
|
+
# Only wrap primitive values if wrap_json_primitives is set.
|
399
|
+
def _wrap_json(value)
|
400
|
+
if klass = JSONDatabaseMethods.json_wrapper(value)
|
401
|
+
klass.new(value)
|
402
|
+
elsif klass = JSONDatabaseMethods.json_primitive_wrapper(value)
|
403
|
+
if wrap_json_primitives
|
404
|
+
klass.new(value)
|
405
|
+
else
|
406
|
+
value
|
407
|
+
end
|
408
|
+
else
|
409
|
+
raise Sequel::InvalidValue, "unhandled json value: #{value.inspect}"
|
410
|
+
end
|
411
|
+
end
|
412
|
+
|
413
|
+
# Wrap the parsed JSON value in the appropriate JSONB wrapper class.
|
414
|
+
# Only wrap primitive values if wrap_json_primitives is set.
|
415
|
+
def _wrap_jsonb(value)
|
416
|
+
if klass = JSONDatabaseMethods.jsonb_wrapper(value)
|
417
|
+
klass.new(value)
|
418
|
+
elsif klass = JSONDatabaseMethods.jsonb_primitive_wrapper(value)
|
419
|
+
if wrap_json_primitives
|
420
|
+
klass.new(value)
|
421
|
+
else
|
422
|
+
value
|
423
|
+
end
|
424
|
+
else
|
425
|
+
raise Sequel::InvalidValue, "unhandled jsonb value: #{value.inspect}"
|
426
|
+
end
|
427
|
+
end
|
428
|
+
|
195
429
|
# Handle json[] and jsonb[] types in bound variables.
|
196
430
|
def bound_variable_array(a)
|
197
431
|
case a
|
198
|
-
when
|
432
|
+
when JSONObject, JSONBObject
|
199
433
|
"\"#{Sequel.object_to_json(a).gsub('"', '\\"')}\""
|
200
434
|
else
|
201
435
|
super
|
@@ -238,41 +472,43 @@ module Sequel
|
|
238
472
|
end
|
239
473
|
end
|
240
474
|
|
241
|
-
# Convert the value given to a
|
475
|
+
# Convert the value given to a JSON wrapper object.
|
242
476
|
def typecast_value_json(value)
|
243
477
|
case value
|
244
|
-
when
|
478
|
+
when JSONObject
|
245
479
|
value
|
246
|
-
when Array
|
247
|
-
JSONArray.new(value)
|
248
|
-
when Hash
|
249
|
-
JSONHash.new(value)
|
250
|
-
when JSONBArray
|
251
|
-
JSONArray.new(value.to_a)
|
252
|
-
when JSONBHash
|
253
|
-
JSONHash.new(value.to_hash)
|
254
480
|
when String
|
255
|
-
|
481
|
+
if typecast_json_strings
|
482
|
+
JSONString.new(value)
|
483
|
+
else
|
484
|
+
_wrap_json(_parse_json(value))
|
485
|
+
end
|
486
|
+
when *JSON_WRAP_CLASSES
|
487
|
+
JSONDatabaseMethods.json_primitive_wrapper(value).new(value)
|
488
|
+
when JSONBObject
|
489
|
+
value = value.__getobj__
|
490
|
+
JSONDatabaseMethods.json_primitive_wrapper(value).new(value)
|
256
491
|
else
|
257
492
|
raise Sequel::InvalidValue, "invalid value for json: #{value.inspect}"
|
258
493
|
end
|
259
494
|
end
|
260
495
|
|
261
|
-
# Convert the value given to a
|
496
|
+
# Convert the value given to a JSONB wrapper object.
|
262
497
|
def typecast_value_jsonb(value)
|
263
498
|
case value
|
264
|
-
when
|
499
|
+
when JSONBObject
|
265
500
|
value
|
266
|
-
when Array
|
267
|
-
JSONBArray.new(value)
|
268
|
-
when Hash
|
269
|
-
JSONBHash.new(value)
|
270
|
-
when JSONArray
|
271
|
-
JSONBArray.new(value.to_a)
|
272
|
-
when JSONHash
|
273
|
-
JSONBHash.new(value.to_hash)
|
274
501
|
when String
|
275
|
-
|
502
|
+
if typecast_json_strings
|
503
|
+
JSONBString.new(value)
|
504
|
+
else
|
505
|
+
_wrap_jsonb(_parse_json(value))
|
506
|
+
end
|
507
|
+
when *JSON_WRAP_CLASSES
|
508
|
+
JSONDatabaseMethods.jsonb_primitive_wrapper(value).new(value)
|
509
|
+
when JSONObject
|
510
|
+
value = value.__getobj__
|
511
|
+
JSONDatabaseMethods.jsonb_primitive_wrapper(value).new(value)
|
276
512
|
else
|
277
513
|
raise Sequel::InvalidValue, "invalid value for jsonb: #{value.inspect}"
|
278
514
|
end
|
@@ -282,40 +518,68 @@ module Sequel
|
|
282
518
|
|
283
519
|
module SQL::Builders
|
284
520
|
# Wrap the array or hash in a Postgres::JSONArray or Postgres::JSONHash.
|
521
|
+
# Also handles Postgres::JSONObject and JSONBObjects.
|
522
|
+
# For other objects, calls +Sequel.pg_json_op+ (which is defined
|
523
|
+
# by the pg_json_ops extension).
|
285
524
|
def pg_json(v)
|
286
525
|
case v
|
287
|
-
when Postgres::
|
526
|
+
when Postgres::JSONObject
|
288
527
|
v
|
289
528
|
when Array
|
290
529
|
Postgres::JSONArray.new(v)
|
291
530
|
when Hash
|
292
531
|
Postgres::JSONHash.new(v)
|
293
|
-
when Postgres::
|
294
|
-
|
295
|
-
|
296
|
-
Postgres::JSONHash.new(v.to_hash)
|
532
|
+
when Postgres::JSONBObject
|
533
|
+
v = v.__getobj__
|
534
|
+
Postgres::JSONDatabaseMethods.json_primitive_wrapper(v).new(v)
|
297
535
|
else
|
298
536
|
Sequel.pg_json_op(v)
|
299
537
|
end
|
300
538
|
end
|
301
539
|
|
540
|
+
# Wraps Ruby array, hash, string, integer, float, true, false, and nil
|
541
|
+
# values with the appropriate JSON wrapper. Raises an exception for
|
542
|
+
# other types.
|
543
|
+
def pg_json_wrap(v)
|
544
|
+
case v
|
545
|
+
when *Postgres::JSON_WRAP_CLASSES
|
546
|
+
Postgres::JSONDatabaseMethods.json_primitive_wrapper(v).new(v)
|
547
|
+
else
|
548
|
+
raise Error, "invalid value passed to Sequel.pg_json_wrap: #{v.inspect}"
|
549
|
+
end
|
550
|
+
end
|
551
|
+
|
302
552
|
# Wrap the array or hash in a Postgres::JSONBArray or Postgres::JSONBHash.
|
553
|
+
# Also handles Postgres::JSONObject and JSONBObjects.
|
554
|
+
# For other objects, calls +Sequel.pg_json_op+ (which is defined
|
555
|
+
# by the pg_json_ops extension).
|
303
556
|
def pg_jsonb(v)
|
304
557
|
case v
|
305
|
-
when Postgres::
|
558
|
+
when Postgres::JSONBObject
|
306
559
|
v
|
307
560
|
when Array
|
308
561
|
Postgres::JSONBArray.new(v)
|
309
562
|
when Hash
|
310
563
|
Postgres::JSONBHash.new(v)
|
311
|
-
when Postgres::
|
312
|
-
|
313
|
-
|
314
|
-
Postgres::JSONBHash.new(v.to_hash)
|
564
|
+
when Postgres::JSONObject
|
565
|
+
v = v.__getobj__
|
566
|
+
Postgres::JSONDatabaseMethods.jsonb_primitive_wrapper(v).new(v)
|
315
567
|
else
|
316
568
|
Sequel.pg_jsonb_op(v)
|
317
569
|
end
|
318
570
|
end
|
571
|
+
|
572
|
+
# Wraps Ruby array, hash, string, integer, float, true, false, and nil
|
573
|
+
# values with the appropriate JSONB wrapper. Raises an exception for
|
574
|
+
# other types.
|
575
|
+
def pg_jsonb_wrap(v)
|
576
|
+
case v
|
577
|
+
when *Postgres::JSON_WRAP_CLASSES
|
578
|
+
Postgres::JSONDatabaseMethods.jsonb_primitive_wrapper(v).new(v)
|
579
|
+
else
|
580
|
+
raise Error, "invalid value passed to Sequel.pg_jsonb_wrap: #{v.inspect}"
|
581
|
+
end
|
582
|
+
end
|
319
583
|
end
|
320
584
|
|
321
585
|
Database.register_extension(:pg_json, Postgres::JSONDatabaseMethods)
|