X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/66d1e7baa29e66d3835d93eb0f60d4159c58c49e..42ec8abc587dd95f06521df28aee6063cb80f009:/pokedex/db/load.py

diff --git a/pokedex/db/load.py b/pokedex/db/load.py
index e6b3287..88f5332 100644
--- a/pokedex/db/load.py
+++ b/pokedex/db/load.py
@@ -11,6 +11,7 @@ import sqlalchemy.types
 from pokedex.db import metadata
 import pokedex.db.tables as tables
 from pokedex.defaults import get_default_csv_dir
+from pokedex.db.dependencies import find_dependent_tables
 
 
 def _get_table_names(metadata, patterns):
@@ -95,7 +96,7 @@ def _get_verbose_prints(verbose):
     return print_start, print_status, print_done
 
 
-def load(session, tables=[], directory=None, drop_tables=False, verbose=False, safe=True):
+def load(session, tables=[], directory=None, drop_tables=False, verbose=False, safe=True, recursive=False):
     """Load data from CSV files into the given database session.
 
     Tables are created automatically.
@@ -119,6 +120,9 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
     `safe`
         If set to False, load can be faster, but can corrupt the database if
         it crashes or is interrupted.
+
+    `recursive`
+        If set to True, load all dependent tables too.
     """
 
     # First take care of verbosity
@@ -128,8 +132,13 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
     if directory is None:
         directory = get_default_csv_dir()
 
+    # XXX why isn't this done in command_load
     table_names = _get_table_names(metadata, tables)
     table_objs = [metadata.tables[name] for name in table_names]
+
+    if recursive:
+        table_objs.extend(find_dependent_tables(table_objs))
+
     table_objs = sqlalchemy.sql.util.sort_tables(table_objs)
 
     # SQLite speed tweaks
@@ -140,12 +149,16 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
     # Drop all tables if requested
     if drop_tables:
         print_start('Dropping tables')
-        for table in reversed(table_objs):
+        for n, table in enumerate(reversed(table_objs)):
             table.drop(checkfirst=True)
+            print_status('%s/%s' % (n, len(table_objs)))
         print_done()
 
-    for table in table_objs:
+    print_start('Creating tables')
+    for n, table in enumerate(table_objs):
         table.create()
+        print_status('%s/%s' % (n, len(table_objs)))
+    print_done()
     connection = session.connection()
 
     # Okay, run through the tables and actually load the data now
@@ -168,6 +181,32 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
         reader = csv.reader(csvfile, lineterminator='\n')
         column_names = [unicode(column) for column in reader.next()]
 
+        if not safe and session.connection().dialect.name == 'postgresql':
+            """
+            Postgres' CSV dialect works with our data, if we mark the not-null
+            columns with FORCE NOT NULL.
+            COPY is only allowed for DB superusers. If you're not one, use safe
+            loading (pokedex load -S).
+            """
+            session.commit()
+            not_null_cols = [c for c in column_names if not table_obj.c[c].nullable]
+            if not_null_cols:
+                force_not_null = 'FORCE NOT NULL ' + ','.join('"%s"' % c for c in not_null_cols)
+            else:
+                force_not_null = ''
+            command = "COPY %(table_name)s (%(columns)s) FROM '%(csvpath)s' CSV HEADER %(force_not_null)s"
+            session.connection().execute(
+                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
+
         # Self-referential tables may contain rows with foreign keys of other
         # rows in the same table that do not yet exist.  Pull these out and add
         # them to the session last
@@ -183,6 +222,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[:] = []