Require and use lowercase names for DatabaseDict tables.

lsst · May 4, 2019 · b8c1ebc · b8c1ebc
1 parent 7b5db25
commit b8c1ebc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/config/datastores/posixDatastore.yaml b/config/datastores/posixDatastore.yaml
@@ -2,7 +2,7 @@ datastore:
   cls: lsst.daf.butler.datastores.posixDatastore.PosixDatastore
   root: <butlerRoot>/datastore
   records:
-    table: PosixDatastoreRecords
+    table: posix_datastore_records
   create: true
   templates:
     # valid_first and valid_last here are YYYYMMDD; we assume we'll switch to

diff --git a/python/lsst/daf/butler/registries/sqlRegistryDatabaseDict.py b/python/lsst/daf/butler/registries/sqlRegistryDatabaseDict.py
@@ -92,6 +92,8 @@ def __init__(self, config, types, key, value, registry, lengths=None):
             raise TypeError("No type provided for key {}".format(key))
         if not types.keys() >= frozenset(value._fields):
             raise TypeError("No type(s) provided for field(s) {}".format(set(value._fields) - types.keys()))
+        if not config["table"].islower():
+            raise ValueError(f"DatabaseDict tablename {config['table']} is not lowercase.")
         self._key = key
         self._value = value
         self._table = Table(config["table"], self.registry._schema.metadata, *allColumns, *allConstraints)

diff --git a/tests/config/basic/posixDatastore2.yaml b/tests/config/basic/posixDatastore2.yaml
@@ -3,7 +3,7 @@ datastore:
   cls: lsst.daf.butler.datastores.posixDatastore.PosixDatastore
   root: <butlerRoot>/butler_test_repository2
   records:
-    table: PosixDatastoreRecords2
+    table: posix_datastore_records_2
   templates:
     default: "{run:02d}/{datasetType}.{component:?}/{tract:?}/{patch:?}/{physical_filter:?}/{instrument:?}_{visit:?}"
     calexp: "{run:02d}/{datasetType}.{component:?}/{datasetType}_v{visit}_f{physical_filter:?}_{component:?}"

diff --git a/tests/config/basic/posixDatastore2P.yaml b/tests/config/basic/posixDatastore2P.yaml
@@ -3,7 +3,7 @@ datastore:
   cls: lsst.daf.butler.datastores.posixDatastore.PosixDatastore
   root: <butlerRoot>/butler_test_repository2
   records:
-    table: PosixDatastoreRecords2
+    table: posix_datastore_records_2
   constraints:
     accept:
       - metric

diff --git a/tests/config/testConfigs/datastores/posixDatastore.yaml b/tests/config/testConfigs/datastores/posixDatastore.yaml
@@ -1,3 +1,3 @@
 datastore:
   records:
-    table: OverrideRecord
+    table: override_record
diff --git a/tests/test_butler.py b/tests/test_butler.py
@@ -71,7 +71,7 @@ def testSearchPath(self):
 
         key = ("datastore", "records", "table")
         self.assertNotEqual(config1[key], config2[key])
-        self.assertEqual(config2[key], "OverrideRecord")
+        self.assertEqual(config2[key], "override_record")
 
 
 class ButlerTests:

diff --git a/tests/test_sqlDatabaseDict.py b/tests/test_sqlDatabaseDict.py
@@ -73,7 +73,7 @@ def testKeyInValue(self):
         """Test that the key is not permitted to be part of the value."""
         value = namedtuple("TestValue", ["x", "y", "z"])
         with self.assertRaises(ValueError):
-            self.registry.makeDatabaseDict(table="TestTable", key=self.key, types=self.types, value=value)
+            self.registry.makeDatabaseDict(table="test_table", key=self.key, types=self.types, value=value)
 
     def testKeyNotInValue(self):
         """Test when the value does not include the key."""
@@ -82,7 +82,7 @@ def testKeyNotInValue(self):
             0: value(y="zero", z=0.0),
             1: value(y="one", z=0.1),
         }
-        d = self.registry.makeDatabaseDict(table="TestTable", key=self.key, types=self.types, value=value)
+        d = self.registry.makeDatabaseDict(table="test_table", key=self.key, types=self.types, value=value)
         self.checkDatabaseDict(d, data)
 
     def testLengths(self):
@@ -92,7 +92,7 @@ def testLengths(self):
             0: value(y="passes", z=0.0),
             1: value(y="fails too long", z=0.1),
         }
-        d = self.registry.makeDatabaseDict(table="TestTable", key=self.key, types=self.types, value=value,
+        d = self.registry.makeDatabaseDict(table="test_table", key=self.key, types=self.types, value=value,
                                            lengths={"y": 6})
 
         # This insert meets the constraint
@@ -109,7 +109,7 @@ def testBadValueTypes(self):
         data = {
             0: value(y=0, z="zero"),
         }
-        d = self.registry.makeDatabaseDict(table="TestTable", key=self.key, types=self.types, value=value)
+        d = self.registry.makeDatabaseDict(table="test_table", key=self.key, types=self.types, value=value)
         with self.assertRaises(TypeError):
             d[0] = data[0]
 
@@ -119,7 +119,7 @@ def testBadKeyTypes(self):
         data = {
             0: value(y="zero", z=0.0),
         }
-        d = self.registry.makeDatabaseDict(table="TestTable", key=self.key, types=self.types, value=value)
+        d = self.registry.makeDatabaseDict(table="test_table", key=self.key, types=self.types, value=value)
         d["zero"] = data[0]
 
     def testExtraFieldsInTable(self):
@@ -134,7 +134,7 @@ def testExtraFieldsInTable(self):
             0: value(y="zero"),
             1: value(y="one"),
         }
-        d = self.registry.makeDatabaseDict(table="TestTable", key=self.key, types=self.types, value=value)
+        d = self.registry.makeDatabaseDict(table="test_table", key=self.key, types=self.types, value=value)
         self.checkDatabaseDict(d, data)
 
     def testExtraFieldsInValue(self):
@@ -144,7 +144,7 @@ def testExtraFieldsInValue(self):
         """
         value = namedtuple("TestValue", ["y", "a"])
         with self.assertRaises(TypeError):
-            self.registry.makeDatabaseDict(table="TestTable", key=self.key, types=self.types, value=value)
+            self.registry.makeDatabaseDict(table="test_table", key=self.key, types=self.types, value=value)
 
 
 if __name__ == "__main__":