sdb_dal 0.0.4 → 0.0.5

data/lib/sdb_dal/lazy_loading_text.rb

@@ -1,4 +1,6 @@
+
 module SdbDal
+
  
 
 class LazyLoadingText

data/lib/sdb_dal/memory_repository.rb

@@ -12,7 +12,8 @@ module SdbDal
         aws_key_id= nil,
         aws_secret_key= nil,
         memcache_servers = nil ,
-        dummy=nil
+        dummy=nil,
+        append_table_to_domain=nil
       )
       clear
     end
@@ -46,8 +47,8 @@ module SdbDal
           record[description.name]=value
         end
       end
-      record["metadata%table_name"]=table_name
-      record["metadata%primary_key"]=primary_key
+       record["metadata%table_name"]=table_name
+      record["metadata%primary_key"]=key
       if index_descriptions
         remove_from_indices(table_name,primary_key)
         index_descriptions.each do |index_name,index|
@@ -99,7 +100,20 @@ module SdbDal
         raise 'query not supported yet'
       end
       result=[]
+      params=nil
+      params=options[:params] if options.has_key?(:params)
 
+      if options.has_key?(:map)
+        params||={}
+        keys=options[:map][:keys]
+        values=options[:map][:values]
+        (0..keys.length-1).each do |i|
+          key=keys[i]
+          value=values[i]
+          params[key]=value
+        end
+
+      end
       if options.has_key?(:index)
         result= retrieve_from_index(table_name,options[:index],options[:index_value])
       else
@@ -108,9 +122,9 @@ module SdbDal
           if record["metadata%table_name"]!=table_name
             ok=false
           else
-            if options.has_key?(:params)
+            if params
              
-              options[:params].each do |param_key,param_value|
+              params.each do |param_key,param_value|
 
                 if param_value==:NOT_NULL
                   if record[param_key]==nil
@@ -156,21 +170,24 @@ module SdbDal
       end
       if options and options[:order_by]
         result.sort! do |a,b|
-          a_value=a[options[:order_by]]
-          b_value=b[options[:order_by]]
-          if options[:order] && options[:order]!=:ascending
-            if b_value
-              b_value <=> a_value
-            else
-              -1
-            end
-          else
-            if a_value
-              a_value <=> b_value
+          
+            a_value=a[options[:order_by]]
+            b_value=b[options[:order_by]]
+                x=0
+                if b_value && a_value
+                  x=b_value <=> a_value
+                elsif a_value
+                  x=-1
+                elsif b_value
+                  x=1
+                else
+                  x=0
+                end
+            if options[:order] && options[:order]!=:ascending
+              x
             else
-              -1
+              -x
             end
-          end
         end
       end
       if options[:limit] and result.length>options[:limit]
@@ -194,28 +211,42 @@ module SdbDal
       remove_from_indices(table_name,primary_key)
     end
     def remove_from_indices(table_name,primary_key)
+      key=make_cache_key(table_name,primary_key);
       if @reverse_indexes[table_name]
-        indicies=@reverse_indexes[table_name][primary_key]
+        indicies=@reverse_indexes[table_name][key]
         if indicies
           indicies.each do |index|
             index.each do |record|
-              if record["metadata%primary_key"]==primary_key
+              if record["metadata%primary_key"]==key
                 index.delete(record)
                 break
               end
             end
           end
-          @reverse_indexes[table_name].delete(primary_key)
+          @reverse_indexes[table_name].delete(key)
         end
       end
 
     end
     private
+    def flatten_key(key)
+      if key.is_a?( Array)
+        flattened_key=""
+        key.each do |key_part|
+          flattened_key<<CGI.escape(key_part.to_s)+"/"
+        end
+        return flattened_key[0..-2]
+      else
+        return CGI.escape(key.to_s)
+      end
+    end
     def make_cache_key(table_name,primary_key)
-      return "cached_objects/#{table_name}/#{CGI.escape(primary_key.to_s)}"
+
+      primary_key=flatten_key(primary_key)
+      return "cached_objects/#{table_name}/#{primary_key}"
     end
     def make_clob_key(table_name,primary_key,clob_name)
-      return "clobs/#{table_name}/#{CGI.escape(primary_key)}/#{clob_name}"
+      return "clobs/#{table_name}/#{flatten_key(primary_key)}/#{clob_name}"
     end
 
   end