Remove some functionality from query function that is not needed there.

posulliv · Dec 6, 2010 · b9c70ac · b9c70ac
1 parent dced2c6
commit b9c70ac
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/lib/drizzle/connection.rb b/lib/drizzle/connection.rb
@@ -131,15 +131,8 @@ def set_db(db_name)
     # execute a query and construct a result object
     #
     def query(query)
-      if @randomize_queries == false or @rand_key.empty?
+      res = LibDrizzle.drizzle_query_str(@con_ptr, nil, query, @ret_ptr)
-        res = LibDrizzle.drizzle_query_str(@con_ptr, nil, query, @ret_ptr)
+      check_return_code
-        check_return_code
-      else
-        rand_query = randomize_query(query)
-        res = LibDrizzle.drizzle_query_str(@con_ptr, nil, rand_query, @ret_ptr)
-        check_return_code
-      end
-
       Result.new(res)
     end
 
@@ -148,6 +141,9 @@ def query(query)
     # keywords
     #
     def randomize_query(query)
+      if @rand_key.empty?
+        return query
+      end
       toks = query.split(" ")
       new_query = ""
       toks.each do |token|