[chronojump/update-database-before-importing] When importing an existing session name: creates "Session Name (1)" (or "(2)", etc.)



commit bee209a9c7d3936160e46e77a2e48e98c1d4d18c
Author: Carles Pina i Estany <carles pina cat>
Date:   Fri Sep 30 12:25:53 2016 +0200

    When importing an existing session name: creates "Session Name (1)" (or "(2)", etc.)

 src/chronojump-importer/chronojump_importer.py     |    2 +-
 .../chronojump_importer_test.py                    |    5 +++++
 src/chronojump-importer/tests/yoyo-expected.sqlite |  Bin 1772544 -> 1772544 bytes
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/chronojump-importer/chronojump_importer.py b/src/chronojump-importer/chronojump_importer.py
index eedc87b..04e449a 100755
--- a/src/chronojump-importer/chronojump_importer.py
+++ b/src/chronojump-importer/chronojump_importer.py
@@ -392,7 +392,7 @@ def import_database(source_path, destination_path, source_session):
             source_file=source_path))
         sys.exit(1)
 
-    destination_db.write(table=session, matches_columns=destination_db.column_names("Session", ["uniqueID"]),
+    destination_db.write(table=session, matches_columns=None,
                          avoids_duplicate_column="name")
 
     new_session_id = session[0].get('new_uniqueID')
diff --git a/src/chronojump-importer/chronojump_importer_test.py 
b/src/chronojump-importer/chronojump_importer_test.py
index c86ae03..31fb59b 100755
--- a/src/chronojump-importer/chronojump_importer_test.py
+++ b/src/chronojump-importer/chronojump_importer_test.py
@@ -63,6 +63,11 @@ class TestImporter(unittest.TestCase):
         diff = difflib.unified_diff(actual_dump, expected_dump)
         diff = "".join(diff)
 
+        if diff != "":
+            # Just to help where the files are when debugging
+            print("Temporary directory: ", temporary_directory_path)
+            print("Base filename: ", base_filename)
+
         self.maxDiff = None
         self.assertEqual(diff, "")
 
diff --git a/src/chronojump-importer/tests/yoyo-expected.sqlite 
b/src/chronojump-importer/tests/yoyo-expected.sqlite
index 51e33ef..f0169aa 100644
Binary files a/src/chronojump-importer/tests/yoyo-expected.sqlite and 
b/src/chronojump-importer/tests/yoyo-expected.sqlite differ


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]