Merge with upstream

VERSION

@@ -1 +1 @@
-Version 2.4.2-stable+timestamp.2013.03.06.12.37.02
+Version 2.4.2-stable+timestamp.2013.03.08.10.18.44

gluon/dal.py

@@ -2668,7 +2668,7 @@ class PostgreSQLAdapter(BaseAdapter):
         elif first.type.startswith('list:'):
             second = '%|'+str(second).replace('|','||').replace('%','%%')+'|%'
         op = case_sensitive and self.LIKE or self.ILIKE
-        return op(first,key)
+        return op(first,second)
 
     # GIS functions
 
@@ -3455,9 +3455,9 @@ class FireBirdAdapter(BaseAdapter):
 
     def CONTAINS(self, first, second, case_sensitive=False):
         if first.type in ('string','text'):
-            key = str(second).replace('%','%%')
+            second = str(second).replace('%','%%')
         elif first.type.startswith('list:'):
-            key = '|'+str(second).replace('|','||').replace('%','%%')+'|'
+            second = '|'+str(second).replace('|','||').replace('%','%%')+'|'
         return self.CONTAINING(first,second)
 
     def _drop(self,table,mode):
@@ -9262,7 +9262,8 @@ class Field(Expression):
             stream = self.uploadfs.open(name, 'rb')
         else:
             # ## if file is on regular filesystem
-            stream = pjoin(file_properties['path'], name)
+            fullname = pjoin(file_properties['path'], name)
+            stream = open(fullname,'rb')
         return (filename, stream)
 
     def retrieve_file_properties(self, name, path=None):

gluon/sqlhtml.py

@@ -286,9 +286,9 @@ jQuery.fn.grow_input = function() {
 function pe(ul, e) {
   var new_line = ml(ul);
   rel(ul);
-  if ($(e.target).parent().is(':visible')) {
+  if (jQuery(e.target).parent().is(':visible')) {
     //make sure we didn't delete the element before we insert after
-    new_line.insertAfter($(e.target).parent());
+    new_line.insertAfter(jQuery(e.target).parent());
   } else {
     //the line we clicked on was deleted, just add to end of list
     new_line.appendTo(ul);
@@ -299,7 +299,7 @@ function pe(ul, e) {
 function rl(ul, e) {
   if (jQuery(ul).children().length > 1) {
     //only remove if we have more than 1 item so the list is never empty
-    $(e.target).parent().remove();
+    jQuery(e.target).parent().remove();
   }
 }
 function ml(ul) {