Update definition for catalogdb.catalog

sdss · Apr 18, 2020 · df73a8f · df73a8f
1 parent c56c3d0
commit df73a8f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/python/sdssdb/peewee/sdss5db/catalogdb.py b/python/sdssdb/peewee/sdss5db/catalogdb.py
@@ -11,7 +11,7 @@
 
 import warnings
 
-from peewee import (BigAutoField, BigIntegerField, CharField,
+from peewee import (BigAutoField, BigIntegerField, CharField, CompositeKey,
                     DeferredThroughModel, DoubleField, FloatField,
                     ForeignKeyField, IntegerField, ManyToManyField, TextField)
 
@@ -36,7 +36,7 @@ class Meta:
 
 class Catalog(CatalogdbModel):
 
-    catalogid = BigIntegerField(primary_key=True, null=False)
+    catalogid = BigIntegerField(null=False)
     iauname = TextField(null=True)
     ra = DoubleField(null=False)
     dec = DoubleField(null=False)
@@ -48,7 +48,8 @@ class Catalog(CatalogdbModel):
 
     class Meta:
         table_name = 'catalog'
-        use_reflection = True
+        use_reflection = False
+        primary_key = CompositeKey('catalogid', 'version')
 
 
 class AllWise(CatalogdbModel):

diff --git a/schema/sdss5db/catalogdb/catalog.sql b/schema/sdss5db/catalogdb/catalog.sql
@@ -10,13 +10,21 @@ CREATE SCHEMA catalogdb;
 SET search_path TO catalogdb;
 
 
+-- Table Definition ----------------------------------------------
+
 CREATE TABLE catalogdb.catalog (
-	catalogid BIGSERIAL PRIMARY KEY NOT NULL,
+    catalogid BIGINT,
     iauname TEXT,
-	ra DOUBLE PRECISION,
-	dec DOUBLE PRECISION,
-	pmra REAL,
-	pmdec REAL,
-	epoch REAL,
-	parallax REAL,
-	version TEXT);
+    ra DOUBLE PRECISION NOT NULL,
+    dec DOUBLE PRECISION NOT NULL,
+    pmra REAL,
+    pmdec REAL,
+    parallax REAL,
+    lead TEXT NOT NULL,
+    version TEXT,
+    CONSTRAINT catalog_pkey PRIMARY KEY (catalogid, version)
+);
+
+-- Indices -------------------------------------------------------
+
+CREATE UNIQUE INDEX catalog_pkey ON catalogdb.catalog(catalogid, version);