activerecord-postgis-adapter 3.0.0.beta3 → 3.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0d04c38823d342013ab3f6499e63555c327ae7d
-  data.tar.gz: 431f6916e008760398744c063d50732dc6474eea
+  metadata.gz: 3c4921aa89cd6c33269ff6f2850140020602440b
+  data.tar.gz: 6a32214e6ccc587ee9ca8c7bdcf29290725d9143
 SHA512:
-  metadata.gz: f54ee77aca056fd2ab87c0af53782feb597e157a70862e23e509e4df17feca439b07de46d384e77a04e067089e78b230d186d9064a76cfe0268f2e3d640593fb
-  data.tar.gz: 065f3afcfbd9fc945125f4dcf7270cfa5a82e4cde7a9d9174ed05cb545a14f0a391c6b63ba614791ac50a082420f1efca0bc2d6c8c7060b91386f19f78663ad6
+  metadata.gz: c4b7f244e186d445554d57be503cd02d6f9cc3f6ead1d3d0f2db5bba7300f9b3a34b0f4f12184984fa7bbf4a3048a4114e6a80be148f2d871cdf1ed59fd286e8
+  data.tar.gz: aac5a7ac04094aca372a331f1c560f9a208c35a119d520d02cebb7258675a7615c7dd262079ed765f15b2e375b5156d1cbd4152a8532f97ca3d081193d608171

data/lib/active_record/connection_adapters/postgis_adapter/arel_tosql.rb

@@ -8,13 +8,12 @@ module Arel  # :nodoc:
                         end
 
     class PostGIS < PostGISSuperclass  # :nodoc:
+      include RGeo::ActiveRecord::SpatialToSql
 
       FUNC_MAP = {
         'st_wkttosql' => 'ST_GeomFromEWKT',
       }
-
-      include RGeo::ActiveRecord::SpatialToSql
-
+      
       def st_func(standard_name)
         FUNC_MAP[standard_name.downcase] || standard_name
       end

data/lib/active_record/connection_adapters/postgis_adapter/main_adapter.rb

@@ -2,6 +2,8 @@ module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGISAdapter  # :nodoc:
       class MainAdapter < PostgreSQLAdapter  # :nodoc:
+        include PostGISAdapter::SchemaStatements
+
         SPATIAL_COLUMN_OPTIONS =
           {
             geography:           { geographic: true },
@@ -24,8 +26,6 @@ module ActiveRecord  # :nodoc:
           @visitor = Arel::Visitors::PostGIS.new(self)
         end
 
-        include PostGISAdapter::SchemaStatements
-
         # def schema_creation
         #   PostGISAdapter::SchemaCreation.new self
         # end
@@ -35,7 +35,7 @@ module ActiveRecord  # :nodoc:
         end
 
         def adapter_name
-          ADAPTER_NAME
+          "PostGIS".freeze
         end
 
         def self.spatial_column_options(key)

data/lib/active_record/connection_adapters/postgis_adapter/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGISAdapter
-      VERSION = '3.0.0.beta3'.freeze
+      VERSION = '3.0.0.beta4'.freeze
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -1,18 +1,10 @@
 # The activerecord-postgis-adapter gem installs the *postgis*
 # connection adapter into ActiveRecord.
 
-module ActiveRecord
-  module ConnectionAdapters
-    module PostGISAdapter
-      # The name returned by #adapter_name
-      ADAPTER_NAME = 'PostGIS'.freeze
-    end
-  end
-end
-
 # :stopdoc:
 
 require 'active_record/connection_adapters/postgresql_adapter'
+require 'rgeo/active_record'
 require 'active_record/connection_adapters/postgis_adapter/version'
 require 'active_record/connection_adapters/postgis_adapter/schema_statements'
 require 'active_record/connection_adapters/postgis_adapter/main_adapter'
@@ -25,6 +17,7 @@ require 'active_record/connection_adapters/postgis_adapter/oid/spatial'
 require 'active_record/connection_adapters/postgis_adapter/create_connection'
 require 'active_record/connection_adapters/postgis_adapter/postgis_database_tasks'
 
+
 ::ActiveRecord::ConnectionAdapters::PostGISAdapter.initial_setup
 
 if defined?(::Rails::Railtie)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 3.0.0.beta4
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
@@ -123,7 +123,6 @@ files:
 - test/database.yml
 - test/ddl_test.rb
 - test/nested_class_test.rb
-- test/postgres_test.rb
 - test/setup_test.rb
 - test/spatial_queries_test.rb
 - test/tasks_test.rb
@@ -158,7 +157,6 @@ test_files:
 - test/database.yml
 - test/ddl_test.rb
 - test/nested_class_test.rb
-- test/postgres_test.rb
 - test/setup_test.rb
 - test/spatial_queries_test.rb
 - test/tasks_test.rb

data/test/postgres_test.rb

@@ -1,24 +0,0 @@
-require 'test_helper'
-
-class PostgresTest < ActiveSupport::TestCase  # :nodoc:
-
-  PLAIN_CONFIG = { adapter: "postgresql", host: "localhost", database: "apa_pg_test" }
-
-  class Dog < ActiveRecord::Base
-    establish_connection PLAIN_CONFIG
-  end
-
-  # unless Dog.connection.tables.include?('dogs')
-  #   ActiveRecord::Schema.define do
-  #     create_table :dogs do |table|
-  #       table.column :name, :string
-  #     end
-  #   end
-  # end
-  #
-  # test "postgres model" do
-  #   assert Dog.count == 0
-  # end
-
-
-end