activerecord-mysql2rgeo-adapter 5.2.2 → 5.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/active_record/connection_adapters/mysql2rgeo/column_methods.rb +2 -1
- data/lib/active_record/connection_adapters/mysql2rgeo/version.rb +1 -1
- data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb +1 -0
- data/lib/active_record/type/spatial.rb +9 -6
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a698ad5caaa0a41779553da7bdff16fab5f61c3feb8d370fe49f424f4ba5cfe1
|
4
|
+
data.tar.gz: 5d7c95ea606c62bce8286b4dbb661b412e80712d9c8049925ee1a96c10fb8c4d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0f256d79b6770604fa7497d0c9b28a92d9b4452f496cec7e461a2cd6f67dc7dc5d14e10934ffafd75ccc24d9fff50b539c2ab5729342a038eefe909681e95dde
|
7
|
+
data.tar.gz: a6842cf1d6f984d0697e5c5baaa5587116a887aca288d7cfd15dcf02e12655e30a00b356fd9a3125e8ac43904cb16fc8ac78e76f905dc8665bec9dabd50b73e3
|
@@ -5,7 +5,8 @@ module ActiveRecord
|
|
5
5
|
module Mysql2Rgeo
|
6
6
|
module ColumnMethods
|
7
7
|
def spatial(name, options = {})
|
8
|
-
raise "You must set a type. For example: 't.spatial type: :
|
8
|
+
raise "You must set a type. For example: 't.spatial type: :point'" unless options[:type]
|
9
|
+
|
9
10
|
column(name, options[:type], options)
|
10
11
|
end
|
11
12
|
|
@@ -24,6 +24,7 @@ require "active_record/connection_adapters/mysql2rgeo/spatial_expressions"
|
|
24
24
|
require "active_record/connection_adapters/mysql2rgeo/arel_tosql"
|
25
25
|
require "active_record/type/spatial"
|
26
26
|
require "active_record/connection_adapters/mysql2rgeo/create_connection"
|
27
|
+
require "active_record/tasks/database_tasks"
|
27
28
|
|
28
29
|
# :startdoc:
|
29
30
|
|
@@ -42,11 +42,11 @@ module ActiveRecord
|
|
42
42
|
|
43
43
|
def spatial_factory
|
44
44
|
@spatial_factory ||=
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
45
|
+
RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
|
46
|
+
geo_type: @geo_type,
|
47
|
+
sql_type: @sql_type,
|
48
|
+
srid: @srid
|
49
|
+
)
|
50
50
|
end
|
51
51
|
|
52
52
|
def klass
|
@@ -64,11 +64,13 @@ module ActiveRecord
|
|
64
64
|
# support setting an RGeo object or a WKT string
|
65
65
|
def serialize(value)
|
66
66
|
return if value.nil?
|
67
|
+
|
67
68
|
geo_value = cast_value(value)
|
68
69
|
|
69
70
|
# TODO - only valid types should be allowed
|
70
71
|
# e.g. linestring is not valid for point column
|
71
72
|
raise "maybe should raise" unless RGeo::Feature::Geometry.check_type(geo_value)
|
73
|
+
|
72
74
|
geo_value
|
73
75
|
end
|
74
76
|
|
@@ -76,6 +78,7 @@ module ActiveRecord
|
|
76
78
|
|
77
79
|
def cast_value(value)
|
78
80
|
return if value.nil?
|
81
|
+
|
79
82
|
::String === value ? parse_wkt(value) : value
|
80
83
|
end
|
81
84
|
|
@@ -91,7 +94,7 @@ module ActiveRecord
|
|
91
94
|
else
|
92
95
|
RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid).parse(string)
|
93
96
|
end
|
94
|
-
rescue RGeo::Error::ParseError
|
97
|
+
rescue RGeo::Error::ParseError, RGeo::Error::InvalidGeometry
|
95
98
|
nil
|
96
99
|
end
|
97
100
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: activerecord-mysql2rgeo-adapter
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.2.
|
4
|
+
version: 5.2.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yongdae Hwang
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-04-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '
|
47
|
+
version: '13.0'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: '
|
54
|
+
version: '13.0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: minitest
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -116,7 +116,7 @@ files:
|
|
116
116
|
- lib/activerecord-mysql2rgeo-adapter.rb
|
117
117
|
homepage: http://github.com/stadia/activerecord-mysql2rgeo-adapter
|
118
118
|
licenses:
|
119
|
-
-
|
119
|
+
- 0BSD
|
120
120
|
metadata: {}
|
121
121
|
post_install_message:
|
122
122
|
rdoc_options: []
|