ppf: Use capitals for SQL statements in access.py.

diff --git a/ppf/db/access.py b/ppf/db/access.py
index 33cf3c8..008ccaf 100644 (file)
--- a/ppf/db/access.py
+++ b/ppf/db/access.py
@@ -120,7 +120,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def insert_swarms_row(self, row):
         try:
-            self.cursor.execute("insert into swarms(torrent, filesize, purpose, source) values (?,?,?,?)", row)
+            self.cursor.execute("INSERT INTO swarms(torrent, filesize, purpose, source) VALUES(?,?,?,?)", row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[swarms]An error ocurred: ", e.args[0])
@@ -128,9 +128,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def select_swarms(self, show=True, swarm_id=-1):
         try:
             if swarm_id == -1:
-                self.cursor.execute("select * from swarms")
+                self.cursor.execute("SELECT * FROM swarms")
             else:
-                self.cursor.execute("select * from swarms where id='%s'" %swarm_id)
+                self.cursor.execute("SELECT * FROM swarms WHERE id='%s'" %swarm_id)
 
             if show == True:
                 for row in self.cursor:
@@ -144,16 +144,16 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def delete_swarms(self, swarm_id=-1):
         try:
             if swarm_id == -1:
-                self.cursor.execute("delete from swarms")
+                self.cursor.execute("DELETE FROM swarms")
             else:
-                self.cursor.execute("delete from swarms where id=?", (swarm_id,))
+                self.cursor.execute("DELETE FROM swarms WHERE id=?", (swarm_id,))
             self.conn.commit()
         except sqlite3.Error, e:
             print("[swarms]An error ocurred: ", e.args[0])
 
     def insert_btclients_row(self, row):
         try:
-            self.cursor.execute("insert into btclients(name, language, dht, streaming) values (?,?,?,?)", row)
+            self.cursor.execute("INSERT INTO btclients(name, language, dht, streaming) VALUES(?,?,?,?)", row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[btclients]An error ocurred: ", e.args[0])
@@ -161,9 +161,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def select_btclients(self, show=True, id=-1):
         try:
             if id == -1:
-                self.cursor.execute("""select * from btclients""")
+                self.cursor.execute("""SELECT * FROM btclients""")
             else:
-                self.cursor.execute("""select * from btclients where id='%s'""" %id)
+                self.cursor.execute("""SELECT * FROM btclients WHERE id='%s'""" %id)
             if show == True:
                 for row in self.cursor:
                     print row
@@ -174,7 +174,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def select_btclients_by_name(self, client_name, show=True):
         try:
-            self.cursor.execute("""select * from btclients where name='%s'""" %client_name)
+            self.cursor.execute("""SELECT * FROM btclients WHERE name='%s'""" %client_name)
             if show == True:
                 for row in self.cursor:
                     print row
@@ -185,7 +185,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def select_btclients_id_by_name(self, client_name):
         try:
-            self.cursor.execute("""select * from btclients where name='%s'""" %client_name)
+            self.cursor.execute("""SELECT * FROM btclients WHERE name='%s'""" %client_name)
             for row in self.cursor:
                 return row[0]
         except sqlite3.Error, e:
@@ -193,7 +193,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
 
     def insert_client_sessions_row(self, row):
         try:
-            self.cursor.execute("insert into client_sessions(swarm_id, client_id, system_os, system_os_version, system_ram, system_cpu, public_ip, public_port, ds_limit, us_limit, start_time) values (?,?,?,?,?,?,?,?,?,?,?)", row)
+            self.cursor.execute("INSERT INTO client_sessions(swarm_id, client_id, system_os, system_os_version, system_ram, system_cpu, public_ip, public_port, ds_limit, us_limit, start_time) VALUES(?,?,?,?,?,?,?,?,?,?,?)", row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
@@ -201,9 +201,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def select_client_sessions_by_id(self, show=True, cs_id=-1):
         try:
             if cs_id == -1:
-                self.cursor.execute("""select * from client_sessions""")
+                self.cursor.execute("""SELECT * FROM client_sessions""")
             else:
-                self.cursor.execute("""select * from client_sessions where id='%s'""" %cs_id)
+                self.cursor.execute("""SELECT * FROM client_sessions WHERE id='%s'""" %cs_id)
             if show == True:
                 for row in self.cursor:
                     print row
@@ -216,14 +216,14 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         try:
             if client_id == None:
                 if swarm_id == -1:
-                    self.cursor.execute("""select * from client_sessions""")
+                    self.cursor.execute("""SELECT * FROM client_sessions""")
                 else:
-                    self.cursor.execute("""select * from client_sessions where swarm_id=?""", (swarm_id, ))
+                    self.cursor.execute("""SELECT * FROM client_sessions WHERE swarm_id=?""", (swarm_id, ))
             else:
                 if swarm_id == -1:
-                    self.cursor.execute("""select * from client_sessions where client_id=?""", (client_id, ))
+                    self.cursor.execute("""SELECT * FROM client_sessions WHERE client_id=?""", (client_id, ))
                 else:
-                    self.cursor.execute("""select * from client_sessions where swarm_id=? and client_id=?""", (swarm_id, client_id))
+                    self.cursor.execute("""SELECT * FROM client_sessions WHERE swarm_id=? and client_id=?""", (swarm_id, client_id))
 
             if show == True:
                 for row in self.cursor:
@@ -236,9 +236,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def delete_client_sessions_by_id(self, cs_id=-1):
         try:
             if cs_id == -1:
-                self.cursor.execute("""delete from client_sessions""")
+                self.cursor.execute("""DELETE FROM client_sessions""")
             else:
-                self.cursor.execute("""delete from client_sessions where id=?""", (cs_id, ))
+                self.cursor.execute("""DELETE FROM client_sessions WHERE id=?""", (cs_id, ))
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
@@ -247,23 +247,23 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         try:
             if client_id == None:
                 if swarm_id == -1:
-                    self.cursor.execute("""delete from client_sessions""")
+                    self.cursor.execute("""DELETE FROM client_sessions""")
                 else:
-                    self.cursor.execute("""delete from client_sessions where swarm_id=?""", (swarm_id, ))
+                    self.cursor.execute("""DELETE FROM client_sessions WHERE swarm_id=?""", (swarm_id, ))
             else:
                 if swarm_id == -1:
-                    self.cursor.execute("""delete from client_sessions where client_id=?""", (client_id, ))
+                    self.cursor.execute("""DELETE FROM client_sessions WHERE client_id=?""", (client_id, ))
                 else:
-                    self.cursor.execute("""delete from client_sessions where swarm_id=? and client_id=?""", (swarm_id, client_id))
+                    self.cursor.execute("""DELETE FROM client_sessions WHERE swarm_id=? and client_id=?""", (swarm_id, client_id))
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
     def insert_status_messages_row(self, row):
         if DEBUG == True:
-            print "[status_messages] insert row", row
+            print "[status_messages] INSERT row", row
         try:
-            self.cursor.execute("insert into status_messages values (?,?,?,?,?,?,?,?,?)", row)
+            self.cursor.execute("INSERT INTO status_messages VALUES(?,?,?,?,?,?,?,?,?)", row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[status_messages]An error ocurred: ", e.args[0])
@@ -271,10 +271,10 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def select_status_messages(self, show=True, cs_id=-1, restrictArray=None):
         try:
             if cs_id == -1:
-                self.cursor.execute("select * from status_messages")
+                self.cursor.execute("SELECT * FROM status_messages")
             else:
                 values = (cs_id, )
-                query = "select * from status_messages where cs_id=? and "
+                query = "SELECT * FROM status_messages WHERE cs_id=? and "
 
                 if restrictArray:
                     for (key, value, op) in restrictArray:
@@ -296,9 +296,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def delete_status_messages(self, cs_id=-1):
         try:
             if cs_id == -1:
-                self.cursor.execute("delete from status_messages")
+                self.cursor.execute("DELETE FROM status_messages")
             else:
-                self.cursor.execute("delete from status_messages where cs_id=?", (cs_id, ))
+                self.cursor.execute("DELETE FROM status_messages WHERE cs_id=?", (cs_id, ))
             self.conn.commit()
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])
@@ -307,7 +307,7 @@ class SQLiteDatabaseAccess(DatabaseAccess):
         if DEBUG == True:
             print "[verbose_messages] insert row", row
         try:
-            self.cursor.execute("insert into verbose_messages values (?,?,?,?,?,?,?,?,?,?)", row)
+            self.cursor.execute("INSERT INTO verbose_messages VALUES(?,?,?,?,?,?,?,?,?,?)", row)
             self.conn.commit()
         except sqlite3.Error, e:
             print ("[verbose_messages]An error ocurred: ", e.args[0])
@@ -315,10 +315,10 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def select_verbose_messages(self, show=True, cs_id=-1, restrictArray=None):
         try:
             if cs_id == -1:
-                self.cursor.execute("select * from verbose_messages")
+                self.cursor.execute("SELECT * FROM verbose_messages")
             else:
                 values = (cs_id, )
-                query = "select * from verbose_messages where cs_id=? and "
+                query = "SELECT * FROM verbose_messages WHERE cs_id=? and "
                 if restrictArray:
                     for (key, value, op) in restrictArray:
                         query += "%s %s ? and " % (key, self.operators[op]) 
@@ -338,9 +338,9 @@ class SQLiteDatabaseAccess(DatabaseAccess):
     def delete_verbose_messages(self, cs_id=-1):
         try:
             if cs_id == -1:
-                self.cursor.execute("delete from verbose_messages")
+                self.cursor.execute("DELETE FROM verbose_messages")
             else:
-                self.cursor.execute("delete from verbose_messages where cs_id=?", (cs_id, ))
+                self.cursor.execute("DELETE FROM verbose_messages WHERE cs_id=?", (cs_id, ))
             self.conn.commit()
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])