activerecord-postgis-adapter 0.6.5 → 0.6.6

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.
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 236c020f52dae956219d01fe115dbd8f409d4633
4
+ data.tar.gz: 3366b5fe7ec15d82409cd93ec935d66853c64ff3
5
+ SHA512:
6
+ metadata.gz: 3ca731b9288775c0f39e135e452c5f7aef6e9fa57e819e2266b6eced126f3d6bc36812f554fd7b79526f9b6a524ca041166490ae75ab2a9ecb8c1142bdae646d
7
+ data.tar.gz: 28c3501a770cb128107612e9fb4202355ed088e56e8a4673fa45664d62719dd91dc13d7fa47d6a4ed4d36ef3a4a4d7e874289ab42c3d87b14763525272f07766
data/Version CHANGED
@@ -1 +1 @@
1
- 0.6.5
1
+ 0.6.6
@@ -122,9 +122,9 @@ def setup_gis(config_)
122
122
  postgis_extension_.each do |extname_|
123
123
  if extname_ == 'postgis_topology'
124
124
  raise ArgumentError, "'topology' must be in schema_search_path for postgis_topology" unless search_path_.include?('topology')
125
- conn_.execute("CREATE EXTENSION #{extname_} SCHEMA topology")
125
+ conn_.execute("CREATE EXTENSION IF NOT EXISTS #{extname_} SCHEMA topology")
126
126
  else
127
- conn_.execute("CREATE EXTENSION #{extname_} SCHEMA #{postgis_schema_}")
127
+ conn_.execute("CREATE EXTENSION IF NOT EXISTS #{extname_} SCHEMA #{postgis_schema_}")
128
128
  end
129
129
  end
130
130
  end
@@ -198,9 +198,9 @@ module ActiveRecord # :nodoc:
198
198
  extension_names.each do |extname_|
199
199
  if extname_ == 'postgis_topology'
200
200
  raise ::ArgumentError, "'topology' must be in schema_search_path for postgis_topology" unless search_path.include?('topology')
201
- connection.execute("CREATE EXTENSION #{extname_} SCHEMA topology")
201
+ connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname_} SCHEMA topology")
202
202
  else
203
- connection.execute("CREATE EXTENSION #{extname_} SCHEMA #{postgis_schema}")
203
+ connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname_} SCHEMA #{postgis_schema}")
204
204
  end
205
205
  end
206
206
  end
@@ -80,17 +80,18 @@ module ActiveRecord # :nodoc:
80
80
  end
81
81
 
82
82
 
83
- # For ActiveRecord 3.1 compatibility: Add the "postgis" adapter to the
84
- # matcher of jdbc-like adapters.
85
-
86
- def self.visitor_for(pool)
87
- config = pool.spec.config
88
- adapter = config[:adapter]
89
- adapter_spec = config[:adapter_spec] || self
90
- if adapter =~ /^(jdbc|jndi|postgis)$/
91
- adapter_spec.arel2_visitors(config).values.first.new(pool)
92
- else
93
- adapter_spec.arel2_visitors(config)[adapter].new(pool)
83
+ # For ActiveRecord 3.1 compatibility under activerecord-jdbc-adapter
84
+ # 1.2.x: Add the "postgis" adapter to the matcher of jdbc-like adapters.
85
+ if(defined?(ArJdbc::Version::VERSION) && ArJdbc::Version::VERSION.to_f < 1.3)
86
+ def self.visitor_for(pool)
87
+ config = pool.spec.config
88
+ adapter = config[:adapter]
89
+ adapter_spec = config[:adapter_spec] || self
90
+ if adapter =~ /^(jdbc|jndi|postgis)$/
91
+ adapter_spec.arel2_visitors(config).values.first.new(pool)
92
+ else
93
+ adapter_spec.arel2_visitors(config)[adapter].new(pool)
94
+ end
94
95
  end
95
96
  end
96
97
 
@@ -46,6 +46,7 @@ module RGeo
46
46
 
47
47
  DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
48
48
  OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
49
+
49
50
  include AdapterTestHelper
50
51
 
51
52
  define_test_methods do
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord-postgis-adapter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.5
5
- prerelease:
4
+ version: 0.6.6
6
5
  platform: ruby
7
6
  authors:
8
7
  - Daniel Azuma
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-06-24 00:00:00.000000000 Z
11
+ date: 2014-05-07 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rgeo-activerecord
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,57 +20,64 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
29
26
  version: 0.5.0
27
+ - !ruby/object:Gem::Dependency
28
+ name: activerecord
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: '3.0'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ~>
39
+ - !ruby/object:Gem::Version
40
+ version: '3.0'
30
41
  - !ruby/object:Gem::Dependency
31
42
  name: rake
32
43
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
44
  requirements:
35
- - - ! '>='
45
+ - - '>='
36
46
  - !ruby/object:Gem::Version
37
47
  version: '0'
38
48
  type: :development
39
49
  prerelease: false
40
50
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
51
  requirements:
43
- - - ! '>='
52
+ - - '>='
44
53
  - !ruby/object:Gem::Version
45
54
  version: '0'
46
55
  - !ruby/object:Gem::Dependency
47
56
  name: minitest
48
57
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
58
  requirements:
51
- - - ! '>='
59
+ - - '>='
52
60
  - !ruby/object:Gem::Version
53
61
  version: '0'
54
62
  type: :development
55
63
  prerelease: false
56
64
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
65
  requirements:
59
- - - ! '>='
66
+ - - '>='
60
67
  - !ruby/object:Gem::Version
61
68
  version: '0'
62
69
  - !ruby/object:Gem::Dependency
63
70
  name: rdoc
64
71
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
72
  requirements:
67
- - - ! '>='
73
+ - - '>='
68
74
  - !ruby/object:Gem::Version
69
75
  version: '0'
70
76
  type: :development
71
77
  prerelease: false
72
78
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
79
  requirements:
75
- - - ! '>='
80
+ - - '>='
76
81
  - !ruby/object:Gem::Version
77
82
  version: '0'
78
83
  description: This is an ActiveRecord connection adapter for PostGIS. It is based on
@@ -120,27 +125,26 @@ files:
120
125
  homepage: http://dazuma.github.com/activerecord-postgis-adapter
121
126
  licenses:
122
127
  - BSD
128
+ metadata: {}
123
129
  post_install_message:
124
130
  rdoc_options: []
125
131
  require_paths:
126
132
  - lib
127
133
  required_ruby_version: !ruby/object:Gem::Requirement
128
- none: false
129
134
  requirements:
130
- - - ! '>='
135
+ - - '>='
131
136
  - !ruby/object:Gem::Version
132
137
  version: 1.8.7
133
138
  required_rubygems_version: !ruby/object:Gem::Requirement
134
- none: false
135
139
  requirements:
136
- - - ! '>'
140
+ - - '>='
137
141
  - !ruby/object:Gem::Version
138
- version: 1.3.1
142
+ version: '0'
139
143
  requirements: []
140
144
  rubyforge_project: virtuoso
141
- rubygems_version: 1.8.25
145
+ rubygems_version: 2.0.14
142
146
  signing_key:
143
- specification_version: 3
147
+ specification_version: 4
144
148
  summary: An ActiveRecord adapter for PostGIS, based on RGeo.
145
149
  test_files:
146
150
  - test/tc_basic.rb
@@ -148,3 +152,4 @@ test_files:
148
152
  - test/tc_nested_class.rb
149
153
  - test/tc_spatial_queries.rb
150
154
  - test/tc_tasks.rb
155
+ has_rdoc: