activerecord-postgis-adapter 3.1.5 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fee81a4f105118b668eb878de411fd97b66d55d4
-  data.tar.gz: 35b004a98e571fdfa144e09e0027112c72a19727
+  metadata.gz: 380360884a0395acaf0c5aef06a7629723fb626c
+  data.tar.gz: 946d727f1d802b68fdaa9cc699ddab13cca21366
 SHA512:
-  metadata.gz: 731d5e563468a576fada2108b39ea1339d7b320eec1765075d39c2f4dd18f6108faa2103d4a4b831bb1c286fd2789a20b8be5feb605ed97ca9ea16d4f877c7d6
-  data.tar.gz: 05441edb1a4b20d95afc7f6a67d0161e5ea5effd10251861dfb9db6efaee1b7cabe4754f5ae24391e803c964f7244dfe74f94189d995c6d5f40ffd0cd4810451
+  metadata.gz: 1b6e68a52ef70938e8b8299938049262c6acd45d1fe3df802f38f69d225034ee24a3ef66a19d8d4b2082dbea77fe0f804d8ac2b2d4b021b088b7ec2832b2e55e
+  data.tar.gz: 1fe70438744374e09787d1c9409976b85887eae506381384e3cc72b6b34de01314194106ead29b942f163c0a61b74e479011803ac4d138566f419812e4d24018

data/lib/active_record/connection_adapters/postgis/create_connection.rb

@@ -19,8 +19,8 @@ module ActiveRecord  # :nodoc:
 
       # Based on the default <tt>postgresql_connection</tt> definition from ActiveRecord.
       # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+      # FULL REPLACEMENT because we need to create a different class.
       def postgis_connection(config)
-        # FULL REPLACEMENT because we need to create a different class.
         conn_params = config.symbolize_keys
 
         conn_params.delete_if { |_, v| v.nil? }
@@ -30,7 +30,8 @@ module ActiveRecord  # :nodoc:
         conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
         # Forward only valid config params to PGconn.connect.
-        conn_params.keep_if { |k, _| VALID_CONN_PARAMS.include?(k) }
+        valid_conn_param_keys = PGconn.conndefaults_hash.keys + [:requiressl]
+        conn_params.slice!(*valid_conn_param_keys)
 
         # The postgres drivers don't allow the creation of an unconnected PGconn object,
         # so just pass a nil connection object for the time being.

data/lib/active_record/connection_adapters/postgis/oid/spatial.rb

@@ -54,7 +54,7 @@ module ActiveRecord
                 has_m:    @has_m,
                 has_z:    @has_z,
                 sql_type: @sql_type,
-                srid:     @srid,
+                srid:     @srid
               )
           end
 
@@ -71,30 +71,23 @@ module ActiveRecord
           end
 
           # support setting an RGeo object or a WKT string
-          def type_cast_for_database(value)
+          def serialize(value)
             return if value.nil?
-            geo_value = type_cast(value)
+            geo_value = cast_value(value)
 
             # TODO - only valid types should be allowed
             # e.g. linestring is not valid for point column
             # raise "maybe should raise" unless RGeo::Feature::Geometry.check_type(geo_value)
 
             RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true)
-              .generate(geo_value)
+                                     .generate(geo_value)
           end
 
           private
 
-          def type_cast(value)
-            return if value.nil?
-            String === value ? parse_wkt(value) : value
-          end
-
           def cast_value(value)
             return if value.nil?
-            RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true).parse(value)
-          rescue RGeo::Error::ParseError
-            nil
+            String === value ? parse_wkt(value) : value
           end
 
           # convert WKT string into RGeo object

data/lib/active_record/connection_adapters/postgis/postgis_database_tasks.rb

@@ -38,7 +38,7 @@ module ActiveRecord  # :nodoc:
             "database"           => "postgres",
             "password"           => su_password,
             "schema_search_path" => "public",
-            "username"           => su_username,
+            "username"           => su_username
           ))
         end
 
@@ -46,7 +46,7 @@ module ActiveRecord  # :nodoc:
           establish_connection(configuration.merge(
             "password"           => su_password,
             "schema_search_path" => "public",
-            "username"           => su_username,
+            "username"           => su_username
           ))
         end
 

data/lib/active_record/connection_adapters/postgis/schema_statements.rb

@@ -6,36 +6,39 @@ module ActiveRecord
         # pass table_name to #new_column
         def columns(table_name)
           # Limit, precision, and scale are all handled by the superclass.
-          column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod|
-            oid = get_oid_type(oid.to_i, fmod.to_i, column_name, type)
-            default_value = extract_value_from_default(oid, default)
+          column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod, collation|
+            oid = oid.to_i
+            fmod = fmod.to_i
+            type_metadata = fetch_type_metadata(column_name, type, oid, fmod)
+            cast_type = get_oid_type(oid.to_i, fmod.to_i, column_name, type)
+            default_value = extract_value_from_default(default)
+
             default_function = extract_default_function(default_value, default)
-            notnull = notnull == "t" if notnull.is_a?(String) # JDBC gets true/false
-            new_column(table_name, column_name, default_value, oid, type, !notnull, default_function)
+            new_column(table_name, column_name, default_value, cast_type, type_metadata, !notnull, default_function, collation)
           end
         end
 
         # override
-        def new_column(table_name, column_name, default, cast_type, sql_type = nil, null = true, default_function = nil)
+        def new_column(table_name, column_name, default, cast_type, sql_type_metadata = nil, null = true, default_function = nil, collation = nil)
           # JDBC gets true/false in Rails 4, where other platforms get 't'/'f' strings.
           if null.is_a?(String)
             null = (null == "t")
           end
 
-          column_info = spatial_column_info(table_name).get(column_name, sql_type)
+          column_info = spatial_column_info(table_name).get(column_name, sql_type_metadata.sql_type)
 
-          SpatialColumn.new(table_name,
-                            column_name,
+          SpatialColumn.new(column_name,
                             default,
-                            cast_type,
-                            sql_type,
+                            sql_type_metadata,
                             null,
                             default_function,
+                            collation,
+                            cast_type,
                             column_info)
         end
 
         # override
-        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L533
+        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L583
         #
         # returns Postgresql sql type string
         # examples:
@@ -47,7 +50,7 @@ module ActiveRecord
         #
         # type_to_sql(:geography, "Point,4326")
         # => "geography(Point,4326)"
-        def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+        def type_to_sql(type, limit = nil, precision = nil, scale = nil, array = nil)
           case type
           when :geometry, :geography
             "#{type}(#{limit})"
@@ -60,22 +63,22 @@ module ActiveRecord
         def native_database_types
           # Add spatial types
           super.merge(
-            geography:           "geography",
-            geometry:            "geometry",
-            geometry_collection: "geometry_collection",
-            line_string:         "line_string",
-            multi_line_string:   "multi_line_string",
-            multi_point:         "multi_point",
-            multi_polygon:       "multi_polygon",
-            spatial:             "geometry",
-            st_point:            "st_point",
-            st_polygon:          "st_polygon",
+            geography:           { name: "geography" },
+            geometry:            { name: "geometry" },
+            geometry_collection: { name: "geometry_collection" },
+            line_string:         { name: "line_string" },
+            multi_line_string:   { name: "multi_line_string" },
+            multi_point:         { name: "multi_point" },
+            multi_polygon:       { name: "multi_polygon" },
+            spatial:             { name: "geometry" },
+            st_point:            { name: "st_point" },
+            st_polygon:          { name: "st_polygon" }
           )
         end
 
         # override
-        def create_table_definition(name, temporary, options, as = nil)
-          PostGIS::TableDefinition.new(native_database_types, name, temporary, options, as)
+        def create_table_definition(name, temporary = false, options = nil, as = nil)
+          PostGIS::TableDefinition.new(name, temporary, options, as)
         end
 
         # memoize hash of column infos for tables

data/lib/active_record/connection_adapters/postgis/spatial_column.rb

@@ -8,9 +8,9 @@ module ActiveRecord  # :nodoc:
         # cast_type example classes:
         #   OID::Spatial
         #   OID::Integer
-        def initialize(table_name, name, default, cast_type, sql_type = nil, null = true, default_function = nil, opts = nil)
-          @table_name = table_name
-          @geographic = !!(sql_type =~ /geography\(/i)
+        def initialize(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation = nil, cast_type = nil, opts = nil)
+          @cast_type = cast_type
+          @geographic = !!(sql_type_metadata.sql_type =~ /geography\(/i)
           if opts
             # This case comes from an entry in the geometry_columns table
             set_geometric_type_from_name(opts[:type])
@@ -21,16 +21,18 @@ module ActiveRecord  # :nodoc:
             # Geographic type information is embedded in the SQL type
             @srid = 4326
             @has_z = @has_m = false
-            build_from_sql_type(sql_type)
+            build_from_sql_type(sql_type_metadata.sql_type)
           elsif sql_type =~ /geography|geometry|point|linestring|polygon/i
+            build_from_sql_type(sql_type_metadata.sql_type)
+          elsif sql_type_metadata.sql_type =~ /geography|geometry|point|linestring|polygon/i
             # A geometry column with no geometry_columns entry.
             # @geometric_type = geo_type_from_sql_type(sql_type)
-            build_from_sql_type(sql_type)
+            build_from_sql_type(sql_type_metadata.sql_type)
           end
-          super(name, default, cast_type, sql_type, null, default_function)
+          super(name, default, sql_type_metadata, null, default_function, collation)
           if spatial?
             if @srid
-              @limit = { srid: @srid, type: to_type_name(geometric_type) }
+              @limit = { srid: @srid, type: geometric_type.type_name.underscore }
               @limit[:has_z] = true if @has_z
               @limit[:has_m] = true if @has_m
               @limit[:geographic] = true if @geographic
@@ -57,7 +59,7 @@ module ActiveRecord  # :nodoc:
         end
 
         def spatial?
-          cast_type.respond_to?(:spatial?) && cast_type.spatial?
+          @cast_type.respond_to?(:spatial?) && @cast_type.spatial?
         end
 
         private
@@ -70,17 +72,6 @@ module ActiveRecord  # :nodoc:
           geo_type, @srid, @has_z, @has_m = OID::Spatial.parse_sql_type(sql_type)
           set_geometric_type_from_name(geo_type)
         end
-
-        def to_type_name(geometric_type)
-          name = geometric_type.type_name.underscore
-          if name == "point"
-            "st_point"
-          elsif name == "polygon"
-            "st_polygon"
-          else
-            name
-          end
-        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "3.1.5".freeze
+      VERSION = "4.0.0.beta1"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -47,9 +47,18 @@ module ActiveRecord
       # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
       DEFAULT_SRID = 0
 
-      def initialize(*args)
+      # def initialize(*args)
+      def initialize(connection, logger, connection_parameters, config)
         super
+
         @visitor = Arel::Visitors::PostGIS.new(self)
+        # copy from https://github.com/rails/rails/blob/6ece7df8d80c6d93db43878fa4c0278a0204072c/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L199
+        if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
+          @prepared_statements = true
+          @visitor.extend(DetermineIfPreparableVisitor)
+        else
+          @prepared_statements = false
+        end
       end
 
       def adapter_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.0.0.beta
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,16 +130,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.
 test_files: []
+has_rdoc: