Fix loading of field table

sdss · Apr 24, 2024 · 99e7f29 · 99e7f29
1 parent b7275a3
commit 99e7f29
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/tests/scripts/sdss5db_too_test.sql b/tests/scripts/sdss5db_too_test.sql
@@ -278,26 +278,12 @@ CREATE TABLE targetdb.field (
     racen DOUBLE PRECISION NOT NULL,
     deccen DOUBLE PRECISION NOT NULL,
     position_angle REAL,
-    slots_exposures INTEGER[][],
-    version_pk INTEGER,
-    cadence_pk INTEGER,
     observatory_pk INTEGER);
 
 CREATE TABLE targetdb.observatory (
     pk SERIAL PRIMARY KEY NOT NULL,
     label TEXT NOT NULL);
 
-\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.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;
-
 ALTER TABLE catalogdb.catalog ADD PRIMARY KEY (catalogid);
 ALTER TABLE catalogdb.sdss_id_stacked ADD PRIMARY KEY (sdss_id);
 ALTER TABLE catalogdb.catalog_to_gaia_dr3_source ADD PRIMARY KEY (catalogid, target_id, version_id);
@@ -367,7 +353,7 @@ CREATE INDEX ON targetdb.cadence(nepochs int4_ops);
 
 CREATE UNIQUE INDEX ON targetdb.design_mode(label);
 
-CREATE INDEX CONCURRENTLY ON targetdb.field (q3c_ang2ipix(ra, dec));
+CREATE INDEX CONCURRENTLY ON targetdb.field (q3c_ang2ipix(racen, deccen));
 CREATE INDEX CONCURRENTLY ON targetdb.field USING BTREE(field_id);
 CREATE INDEX CONCURRENTLY ON targetdb.field USING BTREE(observatory_pk);
 
@@ -376,6 +362,17 @@ INSERT INTO targetdb.cadence VALUES ('bright_1x1', 1, '{0}', '{1}', '{0}', '{0}'
 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.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;