focusing on setlimit (peopel moved on from TC 1.4.10). Closes gh-26

jmettraux · Dec 22, 2009 · 4b0a75e · 4b0a75e
1 parent ee5e442
commit 4b0a75e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/lib/rufus/edo/tabcore.rb b/lib/rufus/edo/tabcore.rb
@@ -533,9 +533,7 @@ def add (colname, operator, val, affirmative=true, no_index=false)
     #
     def limit (i, offset=-1)
 
-      @query.respond_to?(:setlimit) ?
+      @query.setlimit(i, offset)
-        @query.setlimit(i, offset) :
-        @query.setmax(i)
     end
 
     # Sets the sort order for the result of the query

diff --git a/lib/rufus/tokyo/cabinet/lib.rb b/lib/rufus/tokyo/cabinet/lib.rb
@@ -177,12 +177,7 @@ class << self
     callback :TDBQRYPROC, [:pointer, :int, :pointer, :pointer], :int
     attfunc :qry_proc, :tctdbqryproc, [ :pointer, :TDBQRYPROC, :pointer], :bool
 
-
+    attfunc :qry_setlimit, :tctdbqrysetlimit, [ :pointer, :int, :int ], :void
-    begin # since TC 1.4.10
-      attfunc :qry_setmax, :tctdbqrysetmax, [ :pointer, :int ], :void
-    rescue FFI::NotFoundError => nfe
-      attfunc :qry_setlimit, :tctdbqrysetlimit, [ :pointer, :int, :int ], :void
-    end
 
     attfunc :qry_search, :tctdbqrysearch, [ :pointer ], :pointer
     attfunc :qry_searchout, :tctdbqrysearchout, [ :pointer ], :bool

diff --git a/lib/rufus/tokyo/cabinet/table.rb b/lib/rufus/tokyo/cabinet/table.rb
@@ -722,9 +722,7 @@ def add (colname, operator, val, affirmative=true, no_index=false)
     #
     def limit (i, offset=-1)
 
-      lib.respond_to?(:qry_setlimit) ?
+      lib.qry_setlimit(@query, i, offset)
-        lib.qry_setlimit(@query, i, offset) :
-        lib.qry_setmax(@query, i)
     end
 
     # Sets the sort order for the result of the query

diff --git a/lib/rufus/tokyo/tyrant/lib.rb b/lib/rufus/tokyo/tyrant/lib.rb
@@ -140,11 +140,7 @@ class << self
     attfunc :qry_addcond, :tcrdbqryaddcond, [ :pointer, :string, :int, :string ], :void
     attfunc :qry_setorder, :tcrdbqrysetorder, [ :pointer, :string, :int ], :void
 
-    begin
+    attfunc :qry_setlimit, :tcrdbqrysetlimit, [ :pointer, :int, :int ], :void
-      attfunc :qry_setmax, :tcrdbqrysetmax, [ :pointer, :int ], :void
-    rescue FFI::NotFoundError => nfe
-      attfunc :qry_setlimit, :tcrdbqrysetlimit, [ :pointer, :int, :int ], :void
-    end
 
     attfunc :qry_search, :tcrdbqrysearch, [ :pointer ], :pointer
     attfunc :qry_searchout, :tcrdbqrysearchout, [ :pointer ], :bool