Permalink
Browse files

fixes from dkubb fork for dm-core 0.10.2

  • Loading branch information...
1 parent 1ff7747 commit 6d18c096a13b4fbaaeb19371c4a24e85b7571d90 Matt King committed with Jan 15, 2010
Showing with 4 additions and 16 deletions.
  1. +2 −2 dm-geokit.gemspec
  2. +2 −14 lib/dm-geokit/resource.rb
View
@@ -50,8 +50,8 @@ Gem::Specification.new do |s|
s.specification_version = 2
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<dm-core>, [">= 0"])
- s.add_runtime_dependency(%q<andre-geokit>, [">= 0"])
+ s.add_runtime_dependency(%q<dm-core>, ["= 0.10.2"])
+ s.add_runtime_dependency(%q<geokit>, [">= 0"])
else
s.add_dependency(%q<dm-core>, [">= 0"])
s.add_dependency(%q<andre-geokit>, [">= 0"])
@@ -191,11 +191,11 @@ def self.included(base)
RUBY
end
- def property_to_column_name_with_distance(property, qualify)
+ def property_to_column_name_with_distance(property, qualify, qualifier = nil)
if property.is_a?(DataMapper::Property) and property.type == DataMapper::Types::Distance
property.field
else
- property_to_column_name_without_distance(property, qualify)
+ property_to_column_name_without_distance(property, qualify, qualifier)
end
end
end
@@ -222,16 +222,4 @@ class Distance < DataMapper::Type
end
end
- module Aggregates
- module Model
- def size
- count
- end
- end
- module Collection
- def size
- loaded? ? super : count
- end
- end
- end
end

0 comments on commit 6d18c09

Please sign in to comment.