activerecord-mysql2rgeo-adapter 6.0.1 → 6.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/active_record/connection_adapters/mysql2rgeo/arel_tosql.rb +46 -3
- data/lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb +42 -0
- data/lib/active_record/connection_adapters/mysql2rgeo/schema_statements.rb +40 -15
- data/lib/active_record/connection_adapters/mysql2rgeo/spatial_column.rb +16 -22
- data/lib/active_record/connection_adapters/mysql2rgeo/spatial_column_info.rb +48 -0
- data/lib/active_record/connection_adapters/mysql2rgeo/spatial_expressions.rb +3 -3
- data/lib/active_record/connection_adapters/mysql2rgeo/spatial_table_definition.rb +7 -7
- data/lib/active_record/connection_adapters/mysql2rgeo/version.rb +2 -2
- data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb +27 -13
- data/lib/active_record/type/spatial.rb +8 -7
- metadata +14 -14
- data/lib/active_record/connection_adapters/mysql2rgeo/create_connection.rb +0 -51
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fc08589944b261d0dca6908f375c8453eae76a29ff3da7a6c76f264fac0400dd
|
4
|
+
data.tar.gz: a3682118ef63d2605688f0f2c81713af2c58987a42f40425baff6f58326bf059
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6a791e518607f77b3fa3affcca3402498d669d8011613c33e811db57278096382b87897a1477b8b18a66c4175ecd419ed161dd57a050b837b6e160943108158a
|
7
|
+
data.tar.gz: 03d6461ef1db07a0deedba7d5843bf6e9a4a00927de6f5e3b6c1ecf8834e1c95494d6ff03b56d0b08aeab675a4e39cea1e7623808507e5b4c62270f3e540a82f
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
module Arel
|
4
|
-
module Visitors
|
3
|
+
module Arel # :nodoc:
|
4
|
+
module Visitors # :nodoc:
|
5
5
|
# Different super-class under JRuby JDBC adapter.
|
6
6
|
MySQLSuperclass = if defined?(::ArJdbc::MySQL::BindSubstitution)
|
7
7
|
::ArJdbc::MySQL::BindSubstitution
|
@@ -27,12 +27,55 @@ module Arel # :nodoc:
|
|
27
27
|
end
|
28
28
|
|
29
29
|
def visit_String(node, collector)
|
30
|
-
|
30
|
+
node, srid = Mysql2Rgeo.parse_node(node)
|
31
|
+
collector << if srid == 0
|
32
|
+
"#{st_func('ST_WKTToSQL')}(#{quote(node)})"
|
33
|
+
else
|
34
|
+
"#{st_func('ST_WKTToSQL')}(#{quote(node)}, #{srid})"
|
35
|
+
end
|
31
36
|
end
|
32
37
|
|
33
38
|
def visit_RGeo_ActiveRecord_SpatialNamedFunction(node, collector)
|
34
39
|
aggregate(st_func(node.name), node, collector)
|
35
40
|
end
|
41
|
+
|
42
|
+
def visit_in_spatial_context(node, collector)
|
43
|
+
case node
|
44
|
+
when String
|
45
|
+
node, srid = Mysql2Rgeo.parse_node(node)
|
46
|
+
collector << if srid == 0
|
47
|
+
"#{st_func('ST_WKTToSQL')}(#{quote(node)})"
|
48
|
+
else
|
49
|
+
"#{st_func('ST_WKTToSQL')}(#{quote(node)}, #{srid})"
|
50
|
+
end
|
51
|
+
when RGeo::Feature::Instance
|
52
|
+
collector << visit_RGeo_Feature_Instance(node, collector)
|
53
|
+
when RGeo::Cartesian::BoundingBox
|
54
|
+
collector << visit_RGeo_Cartesian_BoundingBox(node, collector)
|
55
|
+
else
|
56
|
+
visit(node, collector)
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
def self.parse_node(node)
|
61
|
+
value, srid = nil, 0
|
62
|
+
if node =~ /.*;.*$/i
|
63
|
+
params = Regexp.last_match(0).split(";")
|
64
|
+
if params.first =~ /(srid|SRID)=\d*/
|
65
|
+
srid = params.first.split("=").last.to_i
|
66
|
+
else
|
67
|
+
value = params.first
|
68
|
+
end
|
69
|
+
if params.last =~ /(srid|SRID)=\d*/
|
70
|
+
srid = params.last.split("=").last.to_i
|
71
|
+
else
|
72
|
+
value = params.last
|
73
|
+
end
|
74
|
+
else
|
75
|
+
value = node
|
76
|
+
end
|
77
|
+
[value, srid]
|
78
|
+
end
|
36
79
|
end
|
37
80
|
end
|
38
81
|
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveRecord
|
4
|
+
module ConnectionAdapters
|
5
|
+
module Mysql2Rgeo
|
6
|
+
class SchemaCreation < MySQL::SchemaCreation # :nodoc:
|
7
|
+
private
|
8
|
+
|
9
|
+
def add_column_options!(sql, options)
|
10
|
+
# By default, TIMESTAMP columns are NOT NULL, cannot contain NULL values,
|
11
|
+
# and assigning NULL assigns the current timestamp. To permit a TIMESTAMP
|
12
|
+
# column to contain NULL, explicitly declare it with the NULL attribute.
|
13
|
+
# See https://dev.mysql.com/doc/refman/en/timestamp-initialization.html
|
14
|
+
if /\Atimestamp\b/.match?(options[:column].sql_type) && !options[:primary_key]
|
15
|
+
sql << " NULL" unless options[:null] == false || options_include_default?(options)
|
16
|
+
end
|
17
|
+
|
18
|
+
if options[:srid]
|
19
|
+
sql << " /*!80003 SRID #{options[:srid]} */"
|
20
|
+
end
|
21
|
+
|
22
|
+
if charset = options[:charset]
|
23
|
+
sql << " CHARACTER SET #{charset}"
|
24
|
+
end
|
25
|
+
|
26
|
+
if collation = options[:collation]
|
27
|
+
sql << " COLLATE #{collation}"
|
28
|
+
end
|
29
|
+
|
30
|
+
if as = options[:as]
|
31
|
+
sql << " AS (#{as})"
|
32
|
+
if options[:stored]
|
33
|
+
sql << (mariadb? ? " PERSISTENT" : " STORED")
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
add_sql_comment!(super, options[:comment])
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
@@ -11,10 +11,13 @@ module ActiveRecord
|
|
11
11
|
indexes = super
|
12
12
|
# HACK(aleks, 06/15/18): MySQL 5 does not support prefix lengths for spatial indexes
|
13
13
|
# https://dev.mysql.com/doc/refman/5.6/en/create-index.html
|
14
|
-
indexes.select
|
14
|
+
indexes.select do |idx|
|
15
|
+
idx.type == :spatial
|
16
|
+
end.each { |idx| idx.is_a?(Struct) ? idx.lengths = {} : idx.instance_variable_set(:@lengths, {}) }
|
15
17
|
indexes
|
16
18
|
end
|
17
19
|
|
20
|
+
# override
|
18
21
|
def type_to_sql(type, limit: nil, precision: nil, scale: nil, unsigned: nil, **) # :nodoc:
|
19
22
|
if (info = RGeo::ActiveRecord.geometric_type_from_name(type.to_s.delete("_")))
|
20
23
|
type = limit[:type] || type if limit.is_a?(::Hash)
|
@@ -42,7 +45,8 @@ module ActiveRecord
|
|
42
45
|
|
43
46
|
def initialize_type_map(m = type_map)
|
44
47
|
super
|
45
|
-
|
48
|
+
|
49
|
+
%w[
|
46
50
|
geometry
|
47
51
|
geometrycollection
|
48
52
|
point
|
@@ -51,12 +55,20 @@ module ActiveRecord
|
|
51
55
|
multipoint
|
52
56
|
multilinestring
|
53
57
|
multipolygon
|
54
|
-
|
55
|
-
m.register_type(geo_type
|
58
|
+
].each do |geo_type|
|
59
|
+
m.register_type(geo_type) do |sql_type|
|
60
|
+
Type::Spatial.new(sql_type)
|
61
|
+
end
|
56
62
|
end
|
57
63
|
end
|
58
64
|
|
59
65
|
private
|
66
|
+
|
67
|
+
# override
|
68
|
+
def schema_creation
|
69
|
+
Mysql2Rgeo::SchemaCreation.new(self)
|
70
|
+
end
|
71
|
+
|
60
72
|
# override
|
61
73
|
def create_table_definition(*args, **options)
|
62
74
|
Mysql2Rgeo::TableDefinition.new(self, *args, **options)
|
@@ -65,22 +77,35 @@ module ActiveRecord
|
|
65
77
|
# override
|
66
78
|
def new_column_from_field(table_name, field)
|
67
79
|
type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
default, default_function =
|
80
|
+
default, default_function = field[:Default], nil
|
81
|
+
|
82
|
+
if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(default)
|
83
|
+
default, default_function = nil, default
|
84
|
+
elsif type_metadata.extra == "DEFAULT_GENERATED"
|
85
|
+
default = +"(#{default})" unless default.start_with?("(")
|
86
|
+
default, default_function = nil, default
|
72
87
|
end
|
73
88
|
|
89
|
+
# {:dimension=>2, :has_m=>false, :has_z=>false, :name=>"latlon", :srid=>0, :type=>"GEOMETRY"}
|
90
|
+
spatial = spatial_column_info(table_name).get(field[:Field], type_metadata.sql_type)
|
91
|
+
|
74
92
|
SpatialColumn.new(
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
93
|
+
field[:Field],
|
94
|
+
default,
|
95
|
+
type_metadata,
|
96
|
+
field[:Null] == "YES",
|
97
|
+
default_function,
|
98
|
+
collation: field[:Collation],
|
99
|
+
comment: field[:Comment].presence,
|
100
|
+
spatial: spatial
|
82
101
|
)
|
83
102
|
end
|
103
|
+
|
104
|
+
# memoize hash of column infos for tables
|
105
|
+
def spatial_column_info(table_name)
|
106
|
+
@spatial_column_info ||= {}
|
107
|
+
@spatial_column_info[table_name.to_sym] = SpatialColumnInfo.new(self, table_name.to_s)
|
108
|
+
end
|
84
109
|
end
|
85
110
|
end
|
86
111
|
end
|
@@ -4,10 +4,13 @@ module ActiveRecord # :nodoc:
|
|
4
4
|
module ConnectionAdapters # :nodoc:
|
5
5
|
module Mysql2Rgeo # :nodoc:
|
6
6
|
class SpatialColumn < ConnectionAdapters::MySQL::Column # :nodoc:
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
7
|
+
def initialize(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation: nil, comment: nil, spatial: nil, **)
|
8
|
+
@sql_type_metadata = sql_type_metadata
|
9
|
+
if spatial
|
10
|
+
# This case comes from an entry in the geometry_columns table
|
11
|
+
set_geometric_type_from_name(spatial[:type])
|
12
|
+
@srid = spatial[:srid].to_i
|
13
|
+
elsif sql_type =~ /geometry|point|linestring|polygon/i
|
11
14
|
build_from_sql_type(sql_type_metadata.sql_type)
|
12
15
|
elsif sql_type_metadata.sql_type =~ /geometry|point|linestring|polygon/i
|
13
16
|
# A geometry column with no geometry_columns entry.
|
@@ -17,8 +20,7 @@ module ActiveRecord # :nodoc:
|
|
17
20
|
super(name, default, sql_type_metadata, null, default_function, collation: collation, comment: comment)
|
18
21
|
if spatial?
|
19
22
|
if @srid
|
20
|
-
@limit = { type:
|
21
|
-
@limit[:srid] = @srid if @srid
|
23
|
+
@limit = { type: geometric_type.type_name.underscore, srid: @srid }
|
22
24
|
end
|
23
25
|
end
|
24
26
|
end
|
@@ -37,28 +39,20 @@ module ActiveRecord # :nodoc:
|
|
37
39
|
false
|
38
40
|
end
|
39
41
|
|
40
|
-
alias
|
41
|
-
alias
|
42
|
-
alias
|
42
|
+
alias geographic? geographic
|
43
|
+
alias has_z? has_z
|
44
|
+
alias has_m? has_m
|
43
45
|
|
44
|
-
def
|
45
|
-
|
46
|
-
@limit
|
47
|
-
else
|
48
|
-
super
|
49
|
-
end
|
46
|
+
def multi?
|
47
|
+
/^(geometrycollection|multi)/i.match?(sql_type)
|
50
48
|
end
|
51
49
|
|
52
|
-
def
|
53
|
-
|
50
|
+
def limit
|
51
|
+
spatial? ? @limit : super
|
54
52
|
end
|
55
53
|
|
56
54
|
def spatial?
|
57
|
-
|
58
|
-
end
|
59
|
-
|
60
|
-
def multi?
|
61
|
-
/^(geometrycollection|multi)/i.match?(sql_type)
|
55
|
+
%i[geometry geography].include?(@sql_type_metadata.type)
|
62
56
|
end
|
63
57
|
|
64
58
|
private
|
@@ -0,0 +1,48 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveRecord # :nodoc:
|
4
|
+
module ConnectionAdapters # :nodoc:
|
5
|
+
module Mysql2Rgeo # :nodoc:
|
6
|
+
# Do spatial sql queries for column info and memoize that info.
|
7
|
+
class SpatialColumnInfo
|
8
|
+
def initialize(adapter, table_name)
|
9
|
+
@adapter = adapter
|
10
|
+
@table_name = table_name
|
11
|
+
end
|
12
|
+
|
13
|
+
def all
|
14
|
+
info = if @adapter.supports_expression_index?
|
15
|
+
@adapter.query(
|
16
|
+
"SELECT column_name, srs_id, column_type FROM INFORMATION_SCHEMA.Columns WHERE table_name='#{@table_name}'"
|
17
|
+
)
|
18
|
+
else
|
19
|
+
@adapter.query(
|
20
|
+
"SELECT column_name, 0, column_type FROM INFORMATION_SCHEMA.Columns WHERE table_name='#{@table_name}'"
|
21
|
+
)
|
22
|
+
end
|
23
|
+
|
24
|
+
result = {}
|
25
|
+
info.each do |row|
|
26
|
+
name = row[0]
|
27
|
+
type = row[2]
|
28
|
+
type.sub!(/m$/, "")
|
29
|
+
result[name] = {
|
30
|
+
name: name,
|
31
|
+
srid: row[1].to_i,
|
32
|
+
type: type,
|
33
|
+
}
|
34
|
+
end
|
35
|
+
result
|
36
|
+
end
|
37
|
+
|
38
|
+
# do not query the database for non-spatial columns/tables
|
39
|
+
def get(column_name, type)
|
40
|
+
return unless Mysql2RgeoAdapter.spatial_column_options(type.to_sym)
|
41
|
+
|
42
|
+
@spatial_column_info ||= all
|
43
|
+
@spatial_column_info[column_name]
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
@@ -15,6 +15,6 @@ module RGeo
|
|
15
15
|
end
|
16
16
|
|
17
17
|
# Allow chaining of spatial expressions from attributes
|
18
|
-
Arel::Attribute.
|
19
|
-
RGeo::ActiveRecord::SpatialConstantNode.
|
20
|
-
RGeo::ActiveRecord::SpatialNamedFunction.
|
18
|
+
Arel::Attribute.include RGeo::ActiveRecord::Mysql2Rgeo::SpatialExpressions
|
19
|
+
RGeo::ActiveRecord::SpatialConstantNode.include RGeo::ActiveRecord::Mysql2Rgeo::SpatialExpressions
|
20
|
+
RGeo::ActiveRecord::SpatialNamedFunction.include RGeo::ActiveRecord::Mysql2Rgeo::SpatialExpressions
|
@@ -1,15 +1,15 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
module ActiveRecord
|
4
|
-
module ConnectionAdapters
|
5
|
-
module Mysql2Rgeo
|
6
|
-
class TableDefinition < MySQL::TableDefinition
|
3
|
+
module ActiveRecord # :nodoc:
|
4
|
+
module ConnectionAdapters # :nodoc:
|
5
|
+
module Mysql2Rgeo # :nodoc:
|
6
|
+
class TableDefinition < MySQL::TableDefinition # :nodoc:
|
7
7
|
include ColumnMethods
|
8
8
|
# super: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
|
9
9
|
def new_column_definition(name, type, **options)
|
10
10
|
if (info = Mysql2RgeoAdapter.spatial_column_options(type.to_sym))
|
11
|
-
if (limit = options.delete(:limit))
|
12
|
-
options.merge!(limit)
|
11
|
+
if (limit = options.delete(:limit)) && limit.is_a?(::Hash)
|
12
|
+
options.merge!(limit)
|
13
13
|
end
|
14
14
|
|
15
15
|
geo_type = ColumnDefinitionUtils.geo_type(options[:type] || type || info[:type])
|
@@ -27,7 +27,7 @@ module ActiveRecord # :nodoc:
|
|
27
27
|
module ColumnDefinitionUtils
|
28
28
|
class << self
|
29
29
|
def geo_type(type = "GEOMETRY")
|
30
|
-
type.to_s.delete(
|
30
|
+
type.to_s.delete("_").upcase
|
31
31
|
end
|
32
32
|
|
33
33
|
def default_srid(options)
|
@@ -7,29 +7,47 @@
|
|
7
7
|
|
8
8
|
require "rgeo/active_record"
|
9
9
|
|
10
|
-
|
11
|
-
module ActiveRecord
|
12
|
-
module ConnectionAdapters
|
13
|
-
AbstractAdapter
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
10
|
+
require "active_record/connection_adapters"
|
17
11
|
require "active_record/connection_adapters/mysql2_adapter"
|
18
12
|
require "active_record/connection_adapters/mysql2rgeo/version"
|
19
13
|
require "active_record/connection_adapters/mysql2rgeo/column_methods"
|
14
|
+
require "active_record/connection_adapters/mysql2rgeo/schema_creation"
|
20
15
|
require "active_record/connection_adapters/mysql2rgeo/schema_statements"
|
21
16
|
require "active_record/connection_adapters/mysql2rgeo/spatial_table_definition"
|
22
17
|
require "active_record/connection_adapters/mysql2rgeo/spatial_column"
|
18
|
+
require "active_record/connection_adapters/mysql2rgeo/spatial_column_info"
|
23
19
|
require "active_record/connection_adapters/mysql2rgeo/spatial_expressions"
|
24
20
|
require "active_record/connection_adapters/mysql2rgeo/arel_tosql"
|
25
21
|
require "active_record/type/spatial"
|
26
|
-
require "active_record/connection_adapters/mysql2rgeo/create_connection"
|
27
22
|
|
28
23
|
# :startdoc:
|
29
24
|
|
30
25
|
module ActiveRecord
|
26
|
+
module ConnectionHandling # :nodoc:
|
27
|
+
# Establishes a connection to the database that's used by all Active Record objects.
|
28
|
+
def mysql2rgeo_connection(config)
|
29
|
+
config = config.symbolize_keys
|
30
|
+
config[:flags] ||= 0
|
31
|
+
|
32
|
+
if config[:flags].kind_of? Array
|
33
|
+
config[:flags].push "FOUND_ROWS"
|
34
|
+
else
|
35
|
+
config[:flags] |= Mysql2::Client::FOUND_ROWS
|
36
|
+
end
|
37
|
+
|
38
|
+
ConnectionAdapters::Mysql2RgeoAdapter.new(
|
39
|
+
ConnectionAdapters::Mysql2RgeoAdapter.new_client(config),
|
40
|
+
logger,
|
41
|
+
nil,
|
42
|
+
config,
|
43
|
+
)
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
31
47
|
module ConnectionAdapters
|
32
48
|
class Mysql2RgeoAdapter < Mysql2Adapter
|
49
|
+
ADAPTER_NAME = "Mysql2Rgeo"
|
50
|
+
|
33
51
|
include Mysql2Rgeo::SchemaStatements
|
34
52
|
|
35
53
|
SPATIAL_COLUMN_OPTIONS =
|
@@ -43,7 +61,7 @@ module ActiveRecord
|
|
43
61
|
spatial: { type: "geometry" },
|
44
62
|
point: {},
|
45
63
|
polygon: {}
|
46
|
-
}
|
64
|
+
}.freeze
|
47
65
|
|
48
66
|
# http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
|
49
67
|
DEFAULT_SRID = 0
|
@@ -54,10 +72,6 @@ module ActiveRecord
|
|
54
72
|
@visitor = Arel::Visitors::Mysql2Rgeo.new(self)
|
55
73
|
end
|
56
74
|
|
57
|
-
def adapter_name
|
58
|
-
"Mysql2Rgeo"
|
59
|
-
end
|
60
|
-
|
61
75
|
def self.spatial_column_options(key)
|
62
76
|
SPATIAL_COLUMN_OPTIONS[key]
|
63
77
|
end
|
@@ -21,7 +21,6 @@ module ActiveRecord
|
|
21
21
|
# srid: 1234
|
22
22
|
def self.parse_sql_type(sql_type)
|
23
23
|
geo_type, srid = nil, 0, false, false
|
24
|
-
|
25
24
|
if sql_type =~ /(geography|geometry)\((.*)\)$/i
|
26
25
|
# geometry(Point)
|
27
26
|
# geometry(Point,4326)
|
@@ -67,7 +66,7 @@ module ActiveRecord
|
|
67
66
|
|
68
67
|
geo_value = cast_value(value)
|
69
68
|
|
70
|
-
# TODO - only valid types should be allowed
|
69
|
+
# TODO: - only valid types should be allowed
|
71
70
|
# e.g. linestring is not valid for point column
|
72
71
|
raise "maybe should raise" unless RGeo::Feature::Geometry.check_type(geo_value)
|
73
72
|
|
@@ -82,16 +81,18 @@ module ActiveRecord
|
|
82
81
|
::String === value ? parse_wkt(value) : value
|
83
82
|
end
|
84
83
|
|
84
|
+
# convert WKT string into RGeo object
|
85
85
|
def parse_wkt(string)
|
86
86
|
marker = string[4, 1]
|
87
|
-
if
|
88
|
-
srid = string[0, 4].
|
89
|
-
RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(string[4..-1])
|
87
|
+
if ["\x00", "\x01"].include?(marker)
|
88
|
+
@srid = string[0, 4].unpack1(marker == "\x01" ? "V" : "N")
|
89
|
+
RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: @srid).parse(string[4..-1])
|
90
90
|
elsif string[0, 10] =~ /[0-9a-fA-F]{8}0[01]/
|
91
|
-
srid = string[0, 8].to_i(16)
|
92
|
-
srid = [srid].pack("V").unpack("N").first if string[9, 1] == "1"
|
91
|
+
@srid = string[0, 8].to_i(16)
|
92
|
+
@srid = [@srid].pack("V").unpack("N").first if string[9, 1] == "1"
|
93
93
|
RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(string[8..-1])
|
94
94
|
else
|
95
|
+
string, @srid = Arel::Visitors::Mysql2Rgeo.parse_node(string)
|
95
96
|
RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid).parse(string)
|
96
97
|
end
|
97
98
|
rescue RGeo::Error::ParseError, RGeo::Error::InvalidGeometry
|
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: 6.
|
4
|
+
version: 6.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yongdae Hwang
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-06-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|
@@ -16,42 +16,42 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 6.
|
19
|
+
version: '6.1'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 6.
|
26
|
+
version: '6.1'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rgeo-activerecord
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version:
|
33
|
+
version: 7.0.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version:
|
40
|
+
version: 7.0.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: rake
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '
|
47
|
+
version: '12.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: '12.0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: minitest
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -105,9 +105,10 @@ files:
|
|
105
105
|
- LICENSE.txt
|
106
106
|
- lib/active_record/connection_adapters/mysql2rgeo/arel_tosql.rb
|
107
107
|
- lib/active_record/connection_adapters/mysql2rgeo/column_methods.rb
|
108
|
-
- lib/active_record/connection_adapters/mysql2rgeo/
|
108
|
+
- lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb
|
109
109
|
- lib/active_record/connection_adapters/mysql2rgeo/schema_statements.rb
|
110
110
|
- lib/active_record/connection_adapters/mysql2rgeo/spatial_column.rb
|
111
|
+
- lib/active_record/connection_adapters/mysql2rgeo/spatial_column_info.rb
|
111
112
|
- lib/active_record/connection_adapters/mysql2rgeo/spatial_expressions.rb
|
112
113
|
- lib/active_record/connection_adapters/mysql2rgeo/spatial_table_definition.rb
|
113
114
|
- lib/active_record/connection_adapters/mysql2rgeo/version.rb
|
@@ -118,7 +119,7 @@ homepage: http://github.com/stadia/activerecord-mysql2rgeo-adapter
|
|
118
119
|
licenses:
|
119
120
|
- BSD-3-Clause
|
120
121
|
metadata: {}
|
121
|
-
post_install_message:
|
122
|
+
post_install_message:
|
122
123
|
rdoc_options: []
|
123
124
|
require_paths:
|
124
125
|
- lib
|
@@ -133,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
133
134
|
- !ruby/object:Gem::Version
|
134
135
|
version: '0'
|
135
136
|
requirements: []
|
136
|
-
|
137
|
-
|
138
|
-
signing_key:
|
137
|
+
rubygems_version: 3.2.33
|
138
|
+
signing_key:
|
139
139
|
specification_version: 4
|
140
140
|
summary: ActiveRecord adapter for MySQL, based on RGeo.
|
141
141
|
test_files: []
|
@@ -1,51 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
if RUBY_ENGINE == "jruby"
|
4
|
-
require "active_record/connection_adapters/jdbcmysql_adapter"
|
5
|
-
else
|
6
|
-
require "mysql2"
|
7
|
-
end
|
8
|
-
|
9
|
-
module ActiveRecord # :nodoc:
|
10
|
-
module ConnectionHandling # :nodoc:
|
11
|
-
if RUBY_ENGINE == "jruby"
|
12
|
-
|
13
|
-
def jdbcmysql2rgeo_connection(config)
|
14
|
-
config[:adapter_class] = ConnectionAdapters::Mysql2RgeoAdapter
|
15
|
-
mysql2_connection(config)
|
16
|
-
end
|
17
|
-
|
18
|
-
alias_method :jdbcmysql2rgeo_connection, :mysql2rgeo_connection
|
19
|
-
|
20
|
-
else
|
21
|
-
|
22
|
-
# Based on the default <tt>mysql2_connection</tt> definition from ActiveRecord.
|
23
|
-
# https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
|
24
|
-
# FULL REPLACEMENT because we need to create a different class.
|
25
|
-
|
26
|
-
def mysql2rgeo_connection(config)
|
27
|
-
config = config.symbolize_keys
|
28
|
-
|
29
|
-
config[:username] = "root" if config[:username].nil?
|
30
|
-
config[:flags] ||= 0
|
31
|
-
|
32
|
-
if Mysql2::Client.const_defined? :FOUND_ROWS
|
33
|
-
if config[:flags].is_a? Array
|
34
|
-
config[:flags].push "FOUND_ROWS"
|
35
|
-
else
|
36
|
-
config[:flags] |= Mysql2::Client::FOUND_ROWS
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
client = Mysql2::Client.new(config)
|
41
|
-
ConnectionAdapters::Mysql2RgeoAdapter.new(client, logger, nil, config)
|
42
|
-
rescue Mysql2::Error => error
|
43
|
-
if error.message.include?("Unknown database")
|
44
|
-
raise ActiveRecord::NoDatabaseError
|
45
|
-
else
|
46
|
-
raise
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|