Skip to content

Commit c637aad

Browse files
authored
Merge pull request #1 from populus-ai/fix-quoting
Update for sqlite wihout double quoting Diskcache is using double-quoted string literals in SQL queries, which is not supported by all SQL databases. This change replaces double quotes with single quotes in SQL queries. Copied from grantjenks#311
2 parents ebfa37c + d9a1c8b commit c637aad

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

diskcache/core.py

+23-23
Original file line numberDiff line numberDiff line change
@@ -542,39 +542,39 @@ def __init__(self, directory=None, timeout=60, disk=Disk, **settings):
542542
# Use triggers to keep Metadata updated.
543543

544544
sql(
545-
'CREATE TRIGGER IF NOT EXISTS Settings_count_insert'
546-
' AFTER INSERT ON Cache FOR EACH ROW BEGIN'
547-
' UPDATE Settings SET value = value + 1'
548-
' WHERE key = "count"; END'
545+
"CREATE TRIGGER IF NOT EXISTS Settings_count_insert"
546+
" AFTER INSERT ON Cache FOR EACH ROW BEGIN"
547+
" UPDATE Settings SET value = value + 1"
548+
" WHERE key = 'count'; END"
549549
)
550550

551551
sql(
552-
'CREATE TRIGGER IF NOT EXISTS Settings_count_delete'
553-
' AFTER DELETE ON Cache FOR EACH ROW BEGIN'
554-
' UPDATE Settings SET value = value - 1'
555-
' WHERE key = "count"; END'
552+
"CREATE TRIGGER IF NOT EXISTS Settings_count_delete"
553+
" AFTER DELETE ON Cache FOR EACH ROW BEGIN"
554+
" UPDATE Settings SET value = value - 1"
555+
" WHERE key = 'count'; END"
556556
)
557557

558558
sql(
559-
'CREATE TRIGGER IF NOT EXISTS Settings_size_insert'
560-
' AFTER INSERT ON Cache FOR EACH ROW BEGIN'
561-
' UPDATE Settings SET value = value + NEW.size'
562-
' WHERE key = "size"; END'
559+
"CREATE TRIGGER IF NOT EXISTS Settings_size_insert"
560+
" AFTER INSERT ON Cache FOR EACH ROW BEGIN"
561+
" UPDATE Settings SET value = value + NEW.size"
562+
" WHERE key = 'size'; END"
563563
)
564564

565565
sql(
566-
'CREATE TRIGGER IF NOT EXISTS Settings_size_update'
567-
' AFTER UPDATE ON Cache FOR EACH ROW BEGIN'
568-
' UPDATE Settings'
569-
' SET value = value + NEW.size - OLD.size'
570-
' WHERE key = "size"; END'
566+
"CREATE TRIGGER IF NOT EXISTS Settings_size_update"
567+
" AFTER UPDATE ON Cache FOR EACH ROW BEGIN"
568+
" UPDATE Settings"
569+
" SET value = value + NEW.size - OLD.size"
570+
" WHERE key = 'size'; END"
571571
)
572572

573573
sql(
574-
'CREATE TRIGGER IF NOT EXISTS Settings_size_delete'
575-
' AFTER DELETE ON Cache FOR EACH ROW BEGIN'
576-
' UPDATE Settings SET value = value - OLD.size'
577-
' WHERE key = "size"; END'
574+
"CREATE TRIGGER IF NOT EXISTS Settings_size_delete"
575+
" AFTER DELETE ON Cache FOR EACH ROW BEGIN"
576+
" UPDATE Settings SET value = value - OLD.size"
577+
" WHERE key = 'size'; END"
578578
)
579579

580580
# Create tag index if requested.
@@ -1177,10 +1177,10 @@ def get(
11771177

11781178
else: # Slow path, transaction required.
11791179
cache_hit = (
1180-
'UPDATE Settings SET value = value + 1 WHERE key = "hits"'
1180+
"UPDATE Settings SET value = value + 1 WHERE key = 'hits'"
11811181
)
11821182
cache_miss = (
1183-
'UPDATE Settings SET value = value + 1 WHERE key = "misses"'
1183+
"UPDATE Settings SET value = value + 1 WHERE key = 'misses'"
11841184
)
11851185

11861186
with self._transact(retry) as (sql, _):

0 commit comments

Comments
 (0)