fixed some bugs around backwards compatability, and reverted a few of @quasiben's changes

which were necessary due to the bugs
- coerce start/stop to ints, sometimes we were passing series of length 1 int there
- quoting strings for pandas expressions

Author: hugo

arraymanagement/nodes/__init__.py

@@ -155,18 +155,25 @@ def descendants(self, ignore_groups=False):
         return descendants
 
 def store_select(pandas_store, key, where=None, **kwargs):
-    if isinstance(where, list):
+    
+    if  "0.12" not in pd.__version__ and isinstance(where, list):
         where = [parse_back_compat(x) for x in where]
+    # we used to accidentally pass series into start/stop
+    if 'start' in kwargs:
+        kwargs['start'] = int(kwargs['start'])
+    if 'stop' in kwargs:
+        kwargs['stop'] = int(kwargs['stop'])
     return pandas_store.select(key, where=where, **kwargs)
 
 """From pandas 
 """
-import warnings
-from pandas.computation.pytables import Expr
-from pandas.compat import string_types
-from datetime import datetime, timedelta
-import numpy as np
 def parse_back_compat(w, op=None, value=None):
+    import warnings
+    from pandas.computation.pytables import Expr
+    from pandas.compat import string_types
+    from datetime import datetime, timedelta
+    import numpy as np
+
     """ allow backward compatibility for passed arguments """
 
     if isinstance(w, dict):
@@ -201,7 +208,7 @@ def parse_back_compat(w, op=None, value=None):
 
             # stringify with quotes these values
             def convert(v):
-                if isinstance(v, (datetime,np.datetime64,timedelta,np.timedelta64)) or hasattr(v, 'timetuple'):
+                if isinstance(v, (basestring, datetime,np.datetime64,timedelta,np.timedelta64)) or hasattr(v, 'timetuple'):
                     return "'{0}'".format(str(v))
                 return v
 

arraymanagement/nodes/sqlcaching.py

@@ -272,6 +272,9 @@ def _single_select(self, **kwargs):
             self.cache_data(query_params)
             cache_info = self.cache_info(query_params)
         start_row, end_row = cache_info
+        #convert these series to ints
+        start_row = start_row[0]
+        end_row = end_row[0]
         if not where:
             where = None
         result = store_select(self.store, self.localpath, 
@@ -371,10 +374,8 @@ def select(self, query_filter, where=None):
             cache_info = self.cache_info(query_filter)
 
         start_row, end_row = cache_info
-
-        #removed start_row, end_row
-        result = store_select(self.store, self.localpath, where=where)
-        #                      start=start_row, stop=end_row)
+        result = store_select(self.store, self.localpath, where=where,
+                              start=start_row, stop=end_row)
         return result
 
     def cache_query(self, query_filter):
@@ -409,7 +410,7 @@ def cache_info(self, query_filter):
         try:
             #rewriting where statement for 0.13 pandas style
             result = store_select(self.store, 'cache_spec',
-                                  where='hashval=="{}"'.format(hashval))
+                                  where=[('hashval', hashval)])
         except KeyError:
             return None
         if result is None: