oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
shortcutme 2016-11-07 23:09:06 +01:00
parent 8955998d25
commit 0d9e3baebc
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Db/DbCursor.py
View file

@ -21,15 +21,15 @@ class DbCursor:
for key, value in params.items(): for key, value in params.items():
if type(value) is list: if type(value) is list:
if key.startswith("not__"): if key.startswith("not__"):
query_wheres.append(key.replace("not__", "")+" NOT IN ("+",".join(["?"]*len(value))+")") query_wheres.append(key.replace("not__", "") + " NOT IN (" + ",".join(["?"] * len(value)) + ")")
else: else:
query_wheres.append(key+" IN ("+",".join(["?"]*len(value))+")") query_wheres.append(key + " IN (" + ",".join(["?"] * len(value)) + ")")
values += value values += value
else: else:
if key.startswith("not__"): if key.startswith("not__"):
query_wheres.append(key.replace("not__", "")+" != ?") query_wheres.append(key.replace("not__", "") + " != ?")
else: else:
query_wheres.append(key+" = ?") query_wheres.append(key + " = ?")
values.append(value) values.append(value)
wheres = " AND ".join(query_wheres) wheres = " AND ".join(query_wheres)
query = re.sub("(.*)[?]", "\\1%s" % wheres, query) # Replace the last ? query = re.sub("(.*)[?]", "\\1%s" % wheres, query) # Replace the last ?
@ -83,16 +83,6 @@ class DbCursor:
# Return: True on success # Return: True on success
def createTable(self, table, cols): def createTable(self, table, cols):
# TODO: Check current structure # TODO: Check current structure
"""table_changed = False
res = c.execute("PRAGMA table_info(%s)" % table)
if res:
for row in res:
print row["name"], row["type"], cols[row["name"]]
print row
else:
table_changed = True
if table_changed: # Table structure changed, drop and create again"""
self.execute("DROP TABLE IF EXISTS %s" % table) self.execute("DROP TABLE IF EXISTS %s" % table)
col_definitions = [] col_definitions = []
for col_name, col_type in cols: for col_name, col_type in cols: