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

Only import supported cols

Browse source
This commit is contained in:
shortcutme 2016-11-07 23:15:09 +01:00
parent 5893bbc199
commit 0b599a95e8
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Db/Db.py
View file

@ -313,6 +313,10 @@ class Db(object):
import_cols = None import_cols = None
replaces = None replaces = None
# Fill import cols from table cols
if not import_cols:
import_cols = set(map(lambda item: item[0], self.schema["tables"][table_name]["cols"]))
cur.execute("DELETE FROM %s WHERE json_id = ?" % table_name, (json_row["json_id"],)) cur.execute("DELETE FROM %s WHERE json_id = ?" % table_name, (json_row["json_id"],))
if node not in data: if node not in data:
@ -329,7 +333,7 @@ class Db(object):
if isinstance(val, dict): # Single row if isinstance(val, dict): # Single row
row = val row = val
if import_cols: if import_cols:
row = {key: row[key] for key in import_cols} # Filter row by import_cols row = {key: row[key] for key in row if key in import_cols} # Filter row by import_cols
row[key_col] = key row[key_col] = key
# Replace in value if necessary # Replace in value if necessary
if replaces: if replaces:
@ -348,6 +352,8 @@ class Db(object):
else: # Map as list else: # Map as list
for row in data[node]: for row in data[node]:
row["json_id"] = json_row["json_id"] row["json_id"] = json_row["json_id"]
if import_cols:
row = {key: row[key] for key in row if key in import_cols} # Filter row by import_cols
cur.execute("INSERT OR REPLACE INTO %s ?" % table_name, row) cur.execute("INSERT OR REPLACE INTO %s ?" % table_name, row)
# Cleanup json row # Cleanup json row