From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Oct 2017 13:26:56 +0000 (+0100)
Subject: Remove any backticks for MySQL escaping
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb84bbd7cf0f7a667f1752149ab348440b323950;p=pbs.git

Remove any backticks for MySQL escaping

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/arches.py b/src/buildservice/arches.py
index 2ec4b202..b06fd738 100644
--- a/src/buildservice/arches.py
+++ b/src/buildservice/arches.py
@@ -7,7 +7,7 @@ class Arches(base.Object):
 		query = "SELECT * FROM arches"
 
 		if not really:
-			query += " WHERE `binary` = 'Y'"
+			query += " WHERE binary = 'Y'"
 		else:
 			query += " WHERE NOT name = 'src'"
 
diff --git a/src/buildservice/keys.py b/src/buildservice/keys.py
index 21d0e9b7..7f4ba788 100644
--- a/src/buildservice/keys.py
+++ b/src/buildservice/keys.py
@@ -38,7 +38,7 @@ class Keys(base.Object):
 		return Key.create(self.pakfire, *args, **kwargs)
 
 	def get_all(self):
-		query = self.db.query("SELECT id FROM `keys` ORDER BY uids")
+		query = self.db.query("SELECT id FROM keys ORDER BY uids")
 
 		keys = []
 		for key in query:
@@ -48,7 +48,7 @@ class Keys(base.Object):
 		return keys
 
 	def get_by_id(self, id):
-		key = self.db.get("SELECT id FROM `keys` WHERE id = %s", id)
+		key = self.db.get("SELECT id FROM keys WHERE id = %s", id)
 		if not key:
 			return
 
@@ -57,7 +57,7 @@ class Keys(base.Object):
 	def get_by_fpr(self, fpr):
 		fpr = "%%%s" % fpr
 
-		key = self.db.get("SELECT id FROM `keys` WHERE fingerprint LIKE %s", fpr)
+		key = self.db.get("SELECT id FROM keys WHERE fingerprint LIKE %s", fpr)
 		if not key:
 			return
 
@@ -89,7 +89,7 @@ class Key(base.Object):
 			return k
 
 		# Insert new into the database.
-		key_id = pakfire.db.execute("INSERT INTO `keys`(fingerprint, uids, data) \
+		key_id = pakfire.db.execute("INSERT INTO keys(fingerprint, uids, data) \
 			VALUES(%s, %s, %s)", fingerprint, ", ".join([u.uid for u in key.uids]), data)
 
 		key = cls(pakfire, key_id)
@@ -100,7 +100,7 @@ class Key(base.Object):
 	@property
 	def data(self):
 		if self._data is None:
-			self._data = self.db.get("SELECT * FROM `keys` WHERE id = %s", self.id)
+			self._data = self.db.get("SELECT * FROM keys WHERE id = %s", self.id)
 			assert self._data
 
 		return self._data
@@ -126,7 +126,7 @@ class Key(base.Object):
 				time_created, time_expires, algo) VALUES(%s, %s, %s, %s, %s)",
 				self.id, subkey.keyid, time_created, time_expires, algo)
 
-		self.db.execute("UPDATE `keys` SET fingerprint = %s, uids = %s, data = %s WHERE id = %s",
+		self.db.execute("UPDATE keys SET fingerprint = %s, uids = %s, data = %s WHERE id = %s",
 			fingerprint, ", ".join([u.uid for u in key.uids]), data, self.id)
 
 	def can_be_deleted(self):
@@ -140,8 +140,8 @@ class Key(base.Object):
 	def delete(self):
 		assert self.can_be_deleted()
 
-		self.db.execute("DELETE FROM `keys_subkeys` WHERE key_id = %s", self.id)
-		self.db.execute("DELETE FROM `keys` WHERE id = %s", self.id)
+		self.db.execute("DELETE FROM keys_subkeys WHERE key_id = %s", self.id)
+		self.db.execute("DELETE FROM keys WHERE id = %s", self.id)
 
 	@property
 	def fingerprint(self):
diff --git a/src/buildservice/messages.py b/src/buildservice/messages.py
index 20e59b18..4842574a 100644
--- a/src/buildservice/messages.py
+++ b/src/buildservice/messages.py
@@ -17,7 +17,7 @@ class Messages(base.Object):
 		if not frm:
 			frm = self.pakfire.settings.get("email_from")
 
-		self.db.execute("INSERT INTO user_messages(frm, `to`, subject, text)"
+		self.db.execute("INSERT INTO user_messages(frm, to, subject, text)"
 			" VALUES(%s, %s, %s, %s)", frm, to, subject, text)
 
 	def get_all(self, limit=None):
@@ -116,4 +116,4 @@ class Messages(base.Object):
 			raise Exception, "Could not send mail: %s" % stderr
 
 		# If everything was okay, we can delete the message in the database.
-		self.delete(msg.id)
\ No newline at end of file
+		self.delete(msg.id)
diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index 7bdd6d7e..e9b2232b 100644
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -184,7 +184,7 @@ class Package(base.Object):
 		keys = []
 		vals = []
 		for key, val in query:
-			keys.append("`%s`" % key)
+			keys.append(key)
 			vals.append(val)
 
 		_query = "INSERT INTO packages(%s)" % ", ".join(keys)
@@ -233,7 +233,7 @@ class Package(base.Object):
 				f.capabilities))
 
 		_pakfire.db.executemany("INSERT INTO filelists(pkg_id, name, size, hash_sha512, \
-			type, config, mode, user, `group`, mtime, capabilities) \
+			type, config, mode, user, group, mtime, capabilities) \
 			VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", filelist)
 
 		# Return the newly created object.
diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 98ccf513..8af92d70 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -246,7 +246,7 @@ class User(base.Object):
 			VALUES(%s, %s, %s)", name, generate_password_hash(passphrase), realname)
 
 		# Add email address.
-		pakfire.db.execute("INSERT INTO users_emails(user_id, email, `primary`) \
+		pakfire.db.execute("INSERT INTO users_emails(user_id, email, primary) \
 			VALUES(%s, %s, 'Y')", id, email)
 
 		# Create row in permissions table.