Merge a66e6ff into 3ace301

zarr-developers · May 15, 2019 · 587ce6f · 587ce6f
2 parents 3ace301 + a66e6ff
commit 587ce6f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/zarr/storage.py b/zarr/storage.py
@@ -2183,11 +2183,12 @@ def update(self, *args, **kwargs):
 
     def listdir(self, path=None):
         path = normalize_storage_path(path)
+        sep = '_' if path=='' else '/'
         keys = self.cursor.execute(
-            '''
+            f'''
             SELECT DISTINCT SUBSTR(m, 0, INSTR(m, "/")) AS l FROM (
                 SELECT LTRIM(SUBSTR(k, LENGTH(?) + 1), "/") || "/" AS m
-                FROM zarr WHERE k LIKE (? || "_%")
+                FROM zarr WHERE k LIKE (? || "{sep}%")
             ) ORDER BY l ASC
             ''',
             (path, path)
@@ -2213,7 +2214,7 @@ def rmdir(self, path=None):
         if path:
             with self.lock:
                 self.cursor.execute(
-                    'DELETE FROM zarr WHERE k LIKE (? || "_%")', (path,)
+                    'DELETE FROM zarr WHERE k LIKE (? || "/%")', (path,)
                 )
         else:
             self.clear()