simple_record 1.5.2 → 1.5.3

data/lib/simple_record/active_sdb.rb

@@ -598,19 +598,22 @@ module SimpleRecord
                     #puts 'select=' + select.to_s
                     from             = options[:from] || domain
                     condition_fields = parse_condition_fields(options[:conditions])
-                    conditions       = options[:conditions] ? " WHERE #{build_conditions(options[:conditions])}" : ''
+                    conditions       = options[:conditions] ? "#{build_conditions(options[:conditions])}" : ''
                     order            = options[:order] ? " ORDER BY #{options[:order]}" : ''
                     limit            = options[:limit] ? " LIMIT #{options[:limit]}" : ''
                     # mix sort by argument (it must present in response)
                     unless order.blank?
                         sort_by, sort_order = sort_options(options[:order])
                         if condition_fields.nil? || !condition_fields.include?(sort_by)
-                            conditions << (conditions.blank? ? " WHERE " : " AND ") << "(#{sort_by} IS NOT NULL)"
+#                            conditions << (conditions.blank? ? " WHERE " : " AND ") << "(#{sort_by} IS NOT NULL)"
+                            conditions = (conditions.blank? ? "" : "(#{conditions}) AND ") << "(#{sort_by} IS NOT NULL)"
                         else
 #                            puts 'skipping is not null on sort because already there.'
                         end
 
                     end
+                    conditions = conditions.blank? ? "" : " WHERE #{conditions}"
+#                    puts 'CONDITIONS=' + conditions
                     "SELECT #{select} FROM `#{from}`#{conditions}#{order}#{limit}"
                 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2010-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency