simple_record 1.4.6 → 1.4.7

data/lib/simple_record/active_sdb.rb

@@ -1,5 +1,3 @@
-# Moved this into SimpleRecord because it's too tightly tied together and ActiveSDB should go away.
-
 #
 # Copyright (c) 2008 RightScale Inc
 #
@@ -372,9 +370,9 @@ module SimpleRecord
                     options[:conditions] = build_conditions(options[:conditions])
                     # join ids condition and user defined conditions
                     options[:conditions] = options[:conditions].blank? ? ids_cond : "(#{options[:conditions]}) AND #{ids_cond}"
-#                    puts 'options=' + options.inspect
+                    #puts 'options=' + options.inspect
                     result = sql_select(options)
-#                    puts 'select_from_ids result=' + result.inspect
+                    #puts 'select_from_ids result=' + result.inspect
                     # if one record was requested then return it
                     unless bunch_of_records_requested
                         record = result[:items].first
@@ -399,9 +397,10 @@ module SimpleRecord
                     count = options[:count] || false
                     #puts 'count? ' + count.to_s
                     @next_token = options[:next_token]
+                    @consistent_read = options[:consistent_read]
                     select_expression = build_select(options)
                     # request items
-                    query_result = self.connection.select(select_expression, @next_token)
+                    query_result = self.connection.select(select_expression, @next_token, @consistent_read)
                     # puts 'QR=' + query_result.inspect
                     ret = {}
                     if count
@@ -466,6 +465,7 @@ module SimpleRecord
                 #
                 def query(options) # :nodoc:
                     @next_token = options[:next_token]
+                    @consistent_read = options[:consistent_read]
                     query_expression = build_conditions(options[:query_expression])
                     # add sort_options to the query_expression
                     if options[:sort_option]
@@ -484,7 +484,7 @@ module SimpleRecord
                         query_expression += sort_by_expression
                     end
                     # request items
-                    query_result = self.connection.query(domain, query_expression, options[:max_number_of_items], @next_token)
+                    query_result = self.connection.query(domain, query_expression, options[:max_number_of_items], @next_token, @consistent_read)
                     @next_token = query_result[:next_token]
                     items = query_result[:items].map do |name|
                         new_item = self.new('id' => name)
@@ -508,7 +508,8 @@ module SimpleRecord
                     records = query( :query_expression    => options[:conditions],
                                      :max_number_of_items => options[:limit],
                                      :next_token          => options[:next_token],
-                                     :sort_option         => options[:sort] || options[:order] )
+                                     :sort_option         => options[:sort] || options[:order],
+                                     :consistent_read     => options[:consistent_read] )
                     options[:auto_load] ? reload_all_records(records) : records
                 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 4
-  - 6
-  version: 1.4.6
+  - 7
+  version: 1.4.7
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -07:00
+date: 2010-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency