Merge pull request #172 from pagreene/constraint-bug

Fix constraint bugs
gyorilab · May 27, 2021 · 29ed827 · 29ed827
2 parents 053df45 + 348a72a
commit 29ed827
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/indra_db/cli/xdd.py b/indra_db/cli/xdd.py
@@ -116,7 +116,8 @@ def dump_statements(self, db):
                     s_rows.add(sd.make_tuple(stmt_batch_id))
 
         logger.info(f"Dumping {len(r_rows)} readings.")
-        db.copy_lazy('reading', r_rows, r_cols, commit=False)
+        db.copy_lazy('reading', r_rows, r_cols, commit=False,
+                     constraint='reading-uniqueness')
 
         logger.info(f"Dumping {len(s_rows)} raw statements.")
         skipped = db.copy_report_lazy('raw_statements', s_rows,

diff --git a/indra_db/databases.py b/indra_db/databases.py
@@ -737,8 +737,12 @@ def _infer_copy_constraint(self, constraint, tbl_name, cols):
         # If a constraint was given, just return it, ensuring it is the object
         # and not just the name.
         if constraint:
-            if isinstance(constraint, str):
-                constraint = tbl.get_constraint(constraint)
+            if not isinstance(constraint, str):
+                if not isinstance(constraint, UniqueConstraint):
+                    raise ValueError("`constraint` should by type "
+                                     "UniqueConstraint or the (str) name of a "
+                                     "UniqueConstraint.")
+                return constraint.name
             return constraint
 
         constraints = [c.name for c in tbl.iter_constraints(cols)]
@@ -749,20 +753,17 @@ def _infer_copy_constraint(self, constraint, tbl_name, cols):
 
         # Hopefully at this point there is exactly one constraint.
         if len(constraints) > 1:
-            raise ValueError("Cannot infer constraint. Only "
-                             "one constraint is allowed, and "
-                             "there are multiple "
-                             "possibilities. Please specify a "
-                             "single constraint.")
+            raise ValueError(f"Cannot infer constraint. Only one constraint is "
+                             f"allowed, and there are multiple possibilities: "
+                             f"{constraints}. Please specify a single "
+                             f"constraint.")
         elif len(constraints) == 1:
             constraint = constraints[0]
         else:
-            raise ValueError("Could not infer a relevant "
-                             "constraint. If no columns have "
-                             "constraints on them, the lazy "
-                             "option is unnecessary. Note that I "
-                             "cannot guess a foreign key "
-                             "constraint.")
+            raise ValueError("Could not infer a relevant constraint. If no "
+                             "columns have constraints on them, the lazy "
+                             "option is unnecessary. Note that I cannot guess "
+                             "a foreign key constraint.")
         return constraint
 
     def _get_constraint_cols(self, constraint, tbl_name, cols):