X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/98328e173a5568a6c64d3315dfe0c0c4b3a0662d..16dd9d8ac11b990125eb836d4d3f7b62c4b1c712:/pokedex/db/load.py

diff --git a/pokedex/db/load.py b/pokedex/db/load.py
index b57d935..f0e4b6d 100644
--- a/pokedex/db/load.py
+++ b/pokedex/db/load.py
@@ -185,15 +185,15 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
                 force_not_null = 'FORCE NOT NULL ' + ','.join('"%s"' % c for c in not_null_cols)
             else:
                 force_not_null = ''
-            command = "COPY {table_name} ({columns}) FROM '{csvpath}' CSV HEADER {force_not_null}"
+            command = "COPY %(table_name)s (%(columns)s) FROM '%(csvpath)s' CSV HEADER %(force_not_null)s"
             session.connection().execute(
-                    command.format(
-                            table_name=table_name,
-                            csvpath=csvpath,
-                            columns=','.join('"%s"' % c for c in column_names),
-                            force_not_null=force_not_null,
-                        )
+                command % dict(
+                    table_name=table_name,
+                    csvpath=csvpath,
+                    columns=','.join('"%s"' % c for c in column_names),
+                    force_not_null=force_not_null,
                 )
+            )
             session.commit()
             print_done()
             continue
@@ -213,6 +213,8 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
 
         new_rows = []
         def insert_and_commit():
+            if not new_rows:
+                return
             session.connection().execute(insert_stmt, new_rows)
             session.commit()
             new_rows[:] = []