Add sdss_id tables to test database

tests/scripts/create_test_database.py

@@ -73,6 +73,7 @@ def create_test_database(
     files = [
         "catalog.csv.gz",
         "sdss_id_stacked.csv.gz",
+        "sdss_id_flat.csv.gz",
         # "catalog_to_sdss_dr13_photoobj_primary.csv.gz",
         "catalog_to_gaia_dr3_source.csv.gz",
         "catalog_to_twomass_psc.csv.gz",

tests/scripts/sdss5db_too_test.sql

@@ -31,6 +31,19 @@ CREATE TABLE catalogdb.sdss_id_stacked (
     sdss_id BIGINT
 );
 
+CREATE TABLE catalogdb.sdss_id_flat (
+    sdss_id BIGINT,
+    catalogid BIGINT,
+    version_id SMALLINT,
+    ra_sdss_id DOUBLE PRECISION,
+    dec_sdss_id DOUBLE PRECISION,
+    n_associated SMALLINT,
+    ra_catalogid DOUBLE PRECISION,
+    dec_catalogid DOUBLE PRECISION,
+    pk BIGINT,
+    rank INTEGER
+);
+
 CREATE TABLE catalogdb.gaia_dr3_source (
     source_id BIGINT,
     ra DOUBLE PRECISION,
@@ -320,8 +333,27 @@ CREATE TABLE opsdb_apo.configuration (
     epoch DOUBLE PRECISION,
     calibration_version TEXT);
 
+\copy catalogdb.catalog FROM PROGRAM '/usr/bin/gzip -dc catalog.csv.gz' WITH CSV HEADER;
+\copy catalogdb.sdss_id_stacked FROM PROGRAM '/usr/bin/gzip -dc sdss_id_stacked.csv.gz' WITH CSV HEADER;
+\copy catalogdb.sdss_id_flat FROM PROGRAM '/usr/bin/gzip -dc sdss_id_flat.csv.gz' WITH CSV HEADER;
+\copy catalogdb.catalog_to_gaia_dr3_source FROM PROGRAM '/usr/bin/gzip -dc catalog_to_gaia_dr3_source.csv.gz' WITH CSV HEADER;
+-- \copy catalogdb.catalog_to_sdss_dr13_photoobj_primary FROM PROGRAM '/usr/bin/gzip -dc catalog_to_sdss_dr13_photoobj_primary.csv.gz' WITH CSV HEADER;
+\copy catalogdb.catalog_to_twomass_psc FROM PROGRAM '/usr/bin/gzip -dc catalog_to_twomass_psc.csv.gz' WITH CSV HEADER;
+\copy catalogdb.gaia_dr3_source FROM PROGRAM '/usr/bin/gzip -dc gaia_dr3_source.csv.gz' WITH CSV HEADER;
+-- \copy catalogdb.sdss_dr13_photoobj FROM PROGRAM '/usr/bin/gzip -dc sdss_dr13_photoobj.csv.gz' WITH CSV HEADER;
+\copy catalogdb.twomass_psc FROM PROGRAM '/usr/bin/gzip -dc twomass_psc.csv.gz' WITH CSV HEADER;
+\copy targetdb.version FROM PROGRAM '/usr/bin/gzip -dc targetdb_version.csv.gz' WITH CSV HEADER;
+\copy targetdb.field FROM PROGRAM '/usr/bin/gzip -dc targetdb_field.csv.gz' WITH CSV HEADER;
+\copy targetdb.design_mode FROM 'design_mode.csv' WITH CSV HEADER;
+
+INSERT INTO catalogdb.version VALUES (31, '1.0.0', '1.0.0');
+INSERT INTO targetdb.cadence VALUES ('bright_1x1', 1, '{0}', '{1}', '{0}', '{0}', '{1}', '{0}', 1, null, 'bright_1x1');
+INSERT INTO targetdb.instrument VALUES (0, 'BOSS'), (1, 'APOGEE');
+INSERT INTO targetdb.observatory VALUES (0, 'APO'), (1, 'LCO');
+
 ALTER TABLE catalogdb.catalog ADD PRIMARY KEY (catalogid);
 ALTER TABLE catalogdb.sdss_id_stacked ADD PRIMARY KEY (sdss_id);
+ALTER TABLE catalogdb.sdss_id_flat ADD PRIMARY KEY (pk);
 ALTER TABLE catalogdb.catalog_to_gaia_dr3_source ADD PRIMARY KEY (catalogid, target_id, version_id);
 -- ALTER TABLE catalogdb.catalog_to_sdss_dr13_photoobj_primary ADD PRIMARY KEY (catalogid, target_id, version_id);
 ALTER TABLE catalogdb.catalog_to_twomass_psc ADD PRIMARY KEY (catalogid, target_id, version_id);
@@ -344,7 +376,6 @@ ALTER TABLE ONLY targetdb.field
     ADD CONSTRAINT version_fk
     FOREIGN KEY (version_pk) REFERENCES targetdb.version(pk);
 
-
 CREATE INDEX ON catalogdb.catalog (version_id);
 CREATE INDEX ON catalogdb.catalog (q3c_ang2ipix(ra, dec));
 
@@ -368,6 +399,16 @@ CREATE INDEX ON catalogdb.catalog_to_too_target (target_id);
 CREATE INDEX ON catalogdb.catalog_to_too_target (best);
 CREATE INDEX ON catalogdb.catalog_to_too_target (version_id);
 
+CREATE INDEX ON catalogdb.sdss_id_stacked(sdss_id);
+CREATE INDEX ON catalogdb.sdss_id_stacked(catalogid21);
+CREATE INDEX ON catalogdb.sdss_id_stacked(catalogid25);
+CREATE INDEX ON catalogdb.sdss_id_stacked(catalogid31);
+
+CREATE INDEX ON catalogdb.sdss_id_flat(sdss_id);
+CREATE INDEX ON catalogdb.sdss_id_flat(catalogid);
+CREATE INDEX ON catalogdb.sdss_id_flat(version_id);
+CREATE INDEX ON catalogdb.sdss_id_flat(rank);
+
 CREATE INDEX ON catalogdb.gaia_dr3_source (q3c_ang2ipix(ra, dec));
 
 -- CREATE INDEX ON catalogdb.sdss_dr13_photoobj (q3c_ang2ipix(ra, dec));
@@ -400,25 +441,6 @@ CREATE INDEX CONCURRENTLY ON targetdb.field USING BTREE(version_pk);
 
 CREATE INDEX CONCURRENTLY ON targetdb.version USING BTREE(plan);
 
-INSERT INTO catalogdb.version VALUES (31, '1.0.0', '1.0.0');
-INSERT INTO targetdb.cadence VALUES ('bright_1x1', 1, '{0}', '{1}', '{0}', '{0}', '{1}', '{0}', 1, null, 'bright_1x1');
-INSERT INTO targetdb.instrument VALUES (0, 'BOSS'), (1, 'APOGEE');
-INSERT INTO targetdb.observatory VALUES (0, 'APO'), (1, 'LCO');
-
-
-\copy catalogdb.catalog FROM PROGRAM '/usr/bin/gzip -dc catalog.csv.gz' WITH CSV HEADER;
-\copy catalogdb.sdss_id_stacked FROM PROGRAM '/usr/bin/gzip -dc sdss_id_stacked.csv.gz' WITH CSV HEADER;
-\copy catalogdb.catalog_to_gaia_dr3_source FROM PROGRAM '/usr/bin/gzip -dc catalog_to_gaia_dr3_source.csv.gz' WITH CSV HEADER;
--- \copy catalogdb.catalog_to_sdss_dr13_photoobj_primary FROM PROGRAM '/usr/bin/gzip -dc catalog_to_sdss_dr13_photoobj_primary.csv.gz' WITH CSV HEADER;
-\copy catalogdb.catalog_to_twomass_psc FROM PROGRAM '/usr/bin/gzip -dc catalog_to_twomass_psc.csv.gz' WITH CSV HEADER;
-\copy catalogdb.gaia_dr3_source FROM PROGRAM '/usr/bin/gzip -dc gaia_dr3_source.csv.gz' WITH CSV HEADER;
--- \copy catalogdb.sdss_dr13_photoobj FROM PROGRAM '/usr/bin/gzip -dc sdss_dr13_photoobj.csv.gz' WITH CSV HEADER;
-\copy catalogdb.twomass_psc FROM PROGRAM '/usr/bin/gzip -dc twomass_psc.csv.gz' WITH CSV HEADER;
-\copy targetdb.version FROM PROGRAM '/usr/bin/gzip -dc targetdb_version.csv.gz' WITH CSV HEADER;
-\copy targetdb.field FROM PROGRAM '/usr/bin/gzip -dc targetdb_field.csv.gz' WITH CSV HEADER;
-\copy targetdb.design_mode FROM 'design_mode.csv' WITH CSV HEADER;
-
-
 VACUUM ANALYZE catalogdb.catalog;
 VACUUM ANALYZE catalogdb.sdss_id_stacked;
 VACUUM ANALYZE catalogdb.catalog_to_gaia_dr3_source;