@@ -9,6 +9,20 @@ when 'postgresql' require 'post_gis_adapter' else raise SpatialAdapterNotCompatibleError.new("Only MySQL and PostgreSQL are currently supported by the spatial adapter plugin.") -end +end + +=begin +# when testing RAILS_ENV isn't set so you'll need to use this style of getting the adapter name +# [TODO] come back and make sure RAILS_ENV exists when running the plugin tests +case ActiveRecord::Base.connection.adapter_name +when 'MySQL' + require 'mysql_spatial_adapter' +when 'PostgreSQL' + require 'post_gis_adapter' + else + raise SpatialAdapterNotCompatibleError.new("Only MySQL and PostgreSQL are currently supported by the spatial adapter plugin.") + end +=end + init.rb @@ -71,8 +71,12 @@ ActiveRecord::Base.class_eval do table_name = connection.quote_table_name(table_name) else table_name = quoted_table_name - end - "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}" + end + begin # this works in AR 2.3.2 and later versions, it might work in earlier versions - this way of checking avoids using version numbers + attribute_condition("#{table_name}.#{connection.quote_column_name(attr)}", "#{value}") + rescue ArgumentError # for some earlier versions of AR it definitely breaks + "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}" + end end end.join(' AND ') end lib/mysql_spatial_adapter.rb @@ -56,11 +56,13 @@ ActiveRecord::Base.class_eval do else "#{table_name}.#{connection.quote_column_name(attr)} && ? " end - elsif ActiveRecord::VERSION::STRING.starts_with?("2.3") - "#{table_name}.#{attribute_condition(connection.quote_column_name(attr), value)}" - else - "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}" - end + else + begin # this works in AR 2.3.2 and later versions, it might work in earlier versions - this way of checking avoids using version numbers + attribute_condition("#{table_name}.#{connection.quote_column_name(attr)}", "#{value}") + rescue ArgumentError # for some earlier versions of AR it definitely breaks + "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}" + end + end end.join(' AND ') end if ActiveRecord::VERSION::STRING == "1.15.1" lib/post_gis_adapter.rb @@ -1,5 +1,5 @@ adapter: mysql database: spatial_adapter_plugin_test username: root -password: +password: 55Shani host: localhost test/db/database_mysql.yml @@ -1,2 +1,7 @@ adapter: postgresql -database: spatial_adapter_plugin_test +database: gem_test +host: localhost +#username: postgres +#password: +username: gem_test +password: gem_test_password test/db/database_postgis.yml @@ -58,6 +58,11 @@ class FindMysqlTest < Test::Unit::TestCase assert(pts.is_a?(Array)) assert_equal(1,pts.length) assert(pts[0].data == "Point3") + end + + def test_find_by_non_geom_column_condition + pts = Park.find_all_by_data 'Point1' + assert(pts,'find by non-geom column is not working') end test/find_mysql_test.rb @@ -60,6 +60,11 @@ class FindPostgisTest < Test::Unit::TestCase assert_equal(2,pts.length) assert(pts[0].data == "Point1" ||pts[1].data == "Point1" ) assert(pts[0].data == "Point2" ||pts[1].data == "Point2" ) + end + + def test_find_by_non_geom_column_condition + pts = Park.find_all_by_data 'Point1' + assert(pts,'find by non-geom column is not working') end test/find_postgis_test.rb e145bf845a95da6a9c860f5331e3ffd59591e052 John Small jds340@gmail.com http://github.com/fragility/spatial_adapter/commit/9fa21d71c8bad58d64402a424278e83a22352c97 9fa21d71c8bad58d64402a424278e83a22352c97 2009-04-23T08:31:12-07:00 2009-04-23T02:25:53-07:00 Added tests to cover the Rails 2.3 fail mode on attribute_condition called test_find_by_non_geom_column_condition in both postgis and mysql. Added the required fix to mysql adapter and changed the fix so that it doesn't depend on Rails 2.3 but will work for any AR version that uses 2 params for attribute_condition. The init.rb file has a comment to read if you want to run tests. Remember to change the database*.yml files. Still to be done;- make sure RAILS_ENV is available when we run tests. Signed-off-by: Pete Deffendol <pete@mdsc.com> a8bae2ff0d1992a6e6b82525294861a96dee4966 Pete Deffendol pete@mdsc.com