@@ -184,7 +184,7 @@ module CompositePrimaryKeys
# Person.exists?(5,7)
def exists?(ids)
if ids.is_a?(Array) && ids.first.is_a?(String)
- count(:conditions => ids).size > 0
+ count(:conditions => ids) > 0
else
obj = find(ids) rescue false
!obj.nil? and obj.is_a?(self)
lib/composite_primary_keys/base.rb
@@ -2,7 +2,7 @@ module CompositePrimaryKeys
module VERSION #:nodoc:
MAJOR = 2
MINOR = 2
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end
end
lib/composite_primary_keys/version.rb
@@ -19,9 +19,11 @@ class TestExists < Test::Unit::TestCase
def test_composite_key_exists_giving_ids_as_array
assert Department.exists?([1,1])
+ assert_equal(false, Department.exists?([1111,1111]))
end
def test_composite_key_exists_giving_ids_as_condition
assert Department.exists?(['department_id = ? and location_id = ?', 1, 1])
+ assert_equal(false, Department.exists?(['department_id = ? and location_id = ?', 11111, 11111]))
end
end
\ No newline at end of file
test/test_exists.rb
@@ -33,7 +33,7 @@
<h1>Composite Primary Keys</h1>
<div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
Get Version
- <a href="http://rubyforge.org/projects/compositekeys" class="numbers">2.2.1</a>
+ <a href="http://rubyforge.org/projects/compositekeys" class="numbers">2.2.2</a>
</div>
<h1>→ Ruby on Rails</h1>
<h1>→ ActiveRecords</h1>
website/index.html
@@ -1,3 +1,3 @@
// Announcement JS file
-var version = "2.2.1";
+var version = "2.2.2";
MagicAnnouncement.show('compositekeys', version);
website/version-raw.js
@@ -1,4 +1,4 @@
// Version JS file
-var version = "2.2.1";
+var version = "2.2.2";
document.write(" - " + version);
website/version.js
102c47fe2b5b382ca819040017c9c6305b67d970
Darrin Holst
darrinholst@gmail.com
http://github.com/drnic/composite_primary_keys/commit/0efff84e20d818323162859687e4011c2e941856
0efff84e20d818323162859687e4011c2e941856
2009-01-23T23:52:08-08:00
2009-01-23T23:52:08-08:00
fix bug with exists? always returning true when passed conditions
d1afd6ddef0fbb8772aa4509f27d22b44821cc14
Darrin Holst
darrinholst@gmail.com