activerecord-postgresql-extensions 0.5.0 → 0.6.0

data/lib/active_record/postgresql_extensions/adapter_extensions.rb

@@ -203,30 +203,27 @@ module ActiveRecord
       end
 
       def extract_schema_name(name)
-        schema, name_part = extract_pg_identifier_from_name(name.to_s)
-        schema if name_part
+        schema, _ = extract_schema_and_table_names(name)
+        schema if schema
       end
 
       def extract_table_name(name)
-        schema, name_part = extract_pg_identifier_from_name(name.to_s)
-
-        unless name_part
-          schema
-        else
-          table_name, name_part = extract_pg_identifier_from_name(name_part)
-          table_name
-        end
+        _, name_part = extract_schema_and_table_names(name)
+        name_part if name_part
       end
 
       def extract_schema_and_table_names(name)
-        schema, name_part = extract_pg_identifier_from_name(name.to_s)
-
-        unless name_part
-          quote_column_name(schema)
-          [ nil, schema ]
+        if name.is_a?(Hash)
+          [ name.keys.first.to_s, name.values.first.to_s ]
         else
-          table_name, name_part = extract_pg_identifier_from_name(name_part)
-          [ schema, table_name ]
+          schema, name_part = extract_pg_identifier_from_name(name.to_s)
+
+          unless name_part
+            [ nil, schema.to_s ]
+          else
+            table_name, name_part = extract_pg_identifier_from_name(name_part)
+            [ schema.to_s, table_name.to_s ]
+          end
         end
       end
 

data/lib/active_record/postgresql_extensions/geometry.rb

@@ -27,6 +27,21 @@ module ActiveRecord
         })
       end
       alias_method_chain :native_database_types, :spatial_types
+
+      # Updates the definition of a geometry field to a new SRID value.
+      def update_geometry_srid(table_name, column_name, srid)
+        schema, table = extract_schema_and_table_names(table_name)
+
+        args = [
+          quote(table),
+          quote(column_name),
+          quote(srid)
+        ]
+
+        args.unshift(quote(schema)) if schema
+
+        execute(%{SELECT UpdateGeometrySRID(#{args.join(', ')});})
+      end
     end
 
     class PostgreSQLGeometryColumnDefinition

data/lib/active_record/postgresql_extensions/version.rb

@@ -1,7 +1,7 @@
 
 module ActiveRecord
   module PostgreSQLExtensions
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end
 

data/test/adapter_extensions_tests.rb

@@ -300,4 +300,24 @@ class AdapterExtensionTests < PostgreSQLExtensionsTestCase
       %{CLUSTER "foo"."bar";}
     ], statements)
   end
+
+  def test_extract_schema_name
+    assert_equal("foo", ARBC.extract_schema_name(:foo => :bar))
+    assert_equal("foo", ARBC.extract_schema_name(%{foo.bar}))
+    assert_equal("foo", ARBC.extract_schema_name(%{"foo"."bar"}))
+    assert_nil(ARBC.extract_schema_name(%{"bar"}))
+  end
+
+  def test_extract_table_name
+    assert_equal("bar", ARBC.extract_table_name(:foo => :bar))
+    assert_equal("bar", ARBC.extract_table_name(%{foo.bar}))
+    assert_equal("bar", ARBC.extract_table_name(%{"foo"."bar"}))
+  end
+
+  def test_extract_schema_and_table_names
+    assert_equal([ "foo", "bar" ], ARBC.extract_schema_and_table_names(:foo => :bar))
+    assert_equal([ "foo", "bar" ], ARBC.extract_schema_and_table_names(%{foo.bar}))
+    assert_equal([ "foo", "bar" ], ARBC.extract_schema_and_table_names(%{"foo"."bar"}))
+    assert_equal([ nil, "bar" ], ARBC.extract_schema_and_table_names(%{"bar"}))
+  end
 end

data/test/geometry_tests.rb

@@ -2,11 +2,32 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
+class GeometryTests < PostgreSQLExtensionsTestCase
+  include PostgreSQLExtensionsTestHelper
+
+  def setup
+    super
+    skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
+  end
+
+  def test_update_geometry_srid
+    ARBC.update_geometry_srid(:foo, :the_geom, 4326)
+    ARBC.update_geometry_srid("foo.bar", :the_geom, 4326)
+    ARBC.update_geometry_srid({ :foo => :bar }, :the_geom, 4326)
+
+    expected = [
+      %{SELECT UpdateGeometrySRID('foo', 'the_geom', 4326);},
+      %{SELECT UpdateGeometrySRID('foo', 'bar', 'the_geom', 4326);},
+      %{SELECT UpdateGeometrySRID('foo', 'bar', 'the_geom', 4326);}
+    ]
+
+    assert_equal(expected, statements)
+  end
+end
+
 if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0'
   class GeometryTests < PostgreSQLExtensionsTestCase
     def test_create_geometry
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geometry :the_geom, :srid => 4326
       end
@@ -28,8 +49,6 @@ if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0
     end
 
     def test_create_geometry_with_spatial
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.spatial :the_geom, :srid => 4326
       end
@@ -51,8 +70,6 @@ if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0
     end
 
     def test_create_geometry_with_spatial_and_spatial_column_type
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.spatial :the_geom, :srid => 4326, :spatial_column_type => :geography
       end
@@ -74,8 +91,6 @@ if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0
     end
 
     def test_create_geography
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geography :the_geom, :srid => 4326
       end
@@ -97,8 +112,6 @@ if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0
     end
 
     def test_create_geometry_with_force_constraints
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geometry :the_geom, :srid => 4326, :force_constraints => true
       end
@@ -143,8 +156,6 @@ if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0
     end
 
     def test_create_geometry_with_not_null
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geometry :the_geom, :srid => 4326, :null => false
       end
@@ -166,8 +177,6 @@ if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0
     end
 
     def test_create_geometry_with_null_and_type
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geometry :the_geom, :srid => 4326, :geometry_type => :polygon
       end
@@ -190,11 +199,7 @@ if (ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib] rescue '') >= '2.0
   end
 else
   class GeometryTests < Test::Unit::TestCase
-    include PostgreSQLExtensionsTestHelper
-
     def test_create_geometry
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geometry :the_geom, :srid => 4326
       end
@@ -226,8 +231,6 @@ else
     end
 
     def test_create_geometry_with_spatial
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.spatial :the_geom, :srid => 4326
       end
@@ -259,8 +262,6 @@ else
     end
 
     def test_create_geometry_with_spatial_and_spatial_column_type
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.spatial :the_geom, :srid => 4326, :spatial_column_type => :geography
       end
@@ -284,8 +285,6 @@ else
     end
 
     def test_create_geography
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geography :the_geom, :srid => 4326
       end
@@ -309,8 +308,6 @@ else
     end
 
     def test_create_geometry_with_schema
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table('shabba.foo') do |t|
         t.geometry :the_geom, :srid => 4326
       end
@@ -342,8 +339,6 @@ else
     end
 
     def test_create_geometry_with_not_null
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geometry :the_geom, :srid => 4326, :null => false
       end
@@ -375,8 +370,6 @@ else
     end
 
     def test_create_geometry_with_null_and_type
-      skip if !ActiveRecord::PostgreSQLExtensions::Features.postgis?
-
       Mig.create_table(:foo) do |t|
         t.geometry :the_geom, :srid => 4326, :geometry_type => :polygon
       end

metadata

@@ -2,14 +2,14 @@
 name: activerecord-postgresql-extensions
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 1506709517929414109
+      hash: -2185802577024505074
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement