From: Jan Fajerski <jfajerski@suse.com>
Date: Tue, 11 Aug 2020 11:50:01 +0000 (+0200)
Subject: pybind/mgr/snap_schedule: don't use as keyword in update statement
X-Git-Tag: v17.0.0~1331^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=19f918a5a09aba3badb81b2e04978e1db24d37c8;p=ceph.git

pybind/mgr/snap_schedule: don't use as keyword in update statement

While UPDATE <table_name> AS <alias> ... should be valid SQL syntax. It seems
like only some sqlite version support it however.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
---

diff --git a/src/pybind/mgr/snap_schedule/fs/schedule.py b/src/pybind/mgr/snap_schedule/fs/schedule.py
index 84323cfb12abc..d22ae6a27e39c 100644
--- a/src/pybind/mgr/snap_schedule/fs/schedule.py
+++ b/src/pybind/mgr/snap_schedule/fs/schedule.py
@@ -354,7 +354,7 @@ class Schedule(object):
         else:
             raise ValueError(f'schedule multiplier "{mult}" not recognized')
 
-    UPDATE_LAST = '''UPDATE schedules_meta AS sm
+    UPDATE_LAST = '''UPDATE schedules_meta
     SET
       last = ?,
       created_count = created_count + 1,
@@ -362,10 +362,10 @@ class Schedule(object):
     WHERE EXISTS(
       SELECT id
       FROM schedules s
-      WHERE s.id = sm.schedule_id
+      WHERE s.id = schedules_meta.schedule_id
       AND s.path = ?
-      AND sm.start = ?
-      AND sm.repeat = ?);'''
+      AND schedules_meta.start = ?
+      AND schedules_meta.repeat = ?);'''
 
     def update_last(self, time, db):
         with db:
@@ -379,16 +379,16 @@ class Schedule(object):
         if not self.first:
             self.first = time
 
-    UPDATE_INACTIVE = '''UPDATE schedules_meta AS sm
+    UPDATE_INACTIVE = '''UPDATE schedules_meta
     SET
       active = 0
     WHERE EXISTS(
       SELECT id
       FROM schedules s
-      WHERE s.id = sm.schedule_id
+      WHERE s.id = schedules_meta.schedule_id
       AND s.path = ?
-      AND sm.start = ?
-      AND sm.repeat = ?);'''
+      AND schedules_meta.start = ?
+      AND schedules_meta.repeat = ?);'''
 
     def set_inactive(self, db):
         with db:
@@ -398,16 +398,16 @@ class Schedule(object):
                                               self.repeat))
         self.active = False
 
-    UPDATE_ACTIVE = '''UPDATE schedules_meta AS sm
+    UPDATE_ACTIVE = '''UPDATE schedules_meta
     SET
       active = 1
     WHERE EXISTS(
       SELECT id
       FROM schedules s
-      WHERE s.id = sm.schedule_id
+      WHERE s.id = schedules_meta.schedule_id
       AND s.path = ?
-      AND sm.start = ?
-      AND sm.repeat = ?);'''
+      AND schedules_meta.start = ?
+      AND schedules_meta.repeat = ?);'''
 
     def set_active(self, db):
         with db:
@@ -417,17 +417,17 @@ class Schedule(object):
                                             self.repeat))
         self.active = True
 
-    UPDATE_PRUNED = '''UPDATE schedules_meta AS sm
+    UPDATE_PRUNED = '''UPDATE schedules_meta
     SET
       last_pruned = ?,
       pruned_count = pruned_count + ?
     WHERE EXISTS(
       SELECT id
       FROM schedules s
-      WHERE s.id = sm.schedule_id
+      WHERE s.id = schedules_meta.schedule_id
       AND s.path = ?
-      AND sm.start = ?
-      AND sm.repeat = ?);'''
+      AND schedules_meta.start = ?
+      AND schedules_meta.repeat = ?);'''
 
     def update_pruned(self, time, db, pruned):
         with db: