From 98f202bfb8f965e1ccc1ca043d29763325aa8706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20S=C3=A1nchez-Gallego?= Date: Fri, 2 Aug 2024 20:29:54 -0600 Subject: [PATCH 1/3] Fix names of columns in SDSS_ID_To_Catalog model --- python/sdssdb/peewee/sdss5db/catalogdb.py | 44 +++++++++---------- python/sdssdb/sqlalchemy/sdss5db/catalogdb.py | 44 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/python/sdssdb/peewee/sdss5db/catalogdb.py b/python/sdssdb/peewee/sdss5db/catalogdb.py index 87e46a48..2de46aee 100644 --- a/python/sdssdb/peewee/sdss5db/catalogdb.py +++ b/python/sdssdb/peewee/sdss5db/catalogdb.py @@ -3272,28 +3272,28 @@ class SDSS_ID_To_Catalog(CatalogdbModel): sdss_id = BigIntegerField() catalogid = BigIntegerField(), version_id = IntegerField(), - allstar_dr17_synspec_rev1_apstar_id = TextField() - allwise_cntr = BigIntegerField() - bhm_rm_v0_pk = BigIntegerField() - bhm_rm_v0_2_pk = BigIntegerField() - catwise_source_id = TextField() - catwise2020_source_id = TextField() - gaia_dr2_source_source_id = BigIntegerField() - gaia_dr3_source_source_id = BigIntegerField() - glimpse_pk = BigIntegerField() - guvcat_objid = BigIntegerField() - legacy_survey_dr10_ls_id = BigIntegerField() - legacy_survey_dr8_ls_id = BigIntegerField() - panstarrs1_catid_objid = BigIntegerField() - ps1_g18_objid = BigIntegerField() - sdss_dr13_photoobj_objid = BigIntegerField() - skymapper_dr1_1_object_id = BigIntegerField() - skymapper_dr2_object_id = BigIntegerField() - supercosmos_objid = BigIntegerField() - tic_v8_id = BigIntegerField() - twomass_psc_pts_key = IntegerField() - tycho2_designation = TextField() - unwise_unwise_objid = TextField() + allstar_dr17_synspec_rev1__apstar_id = TextField() + allwise__cntr = BigIntegerField() + bhm_rm_v0__pk = BigIntegerField() + bhm_rm_v0_2__pk = BigIntegerField() + catwise__source_id = TextField() + catwise2020__source_id = TextField() + gaia_dr2_source__source_id = BigIntegerField() + gaia_dr3_source__source_id = BigIntegerField() + glimpse__pk = BigIntegerField() + guvcat__objid = BigIntegerField() + legacy_survey_dr10__ls_id = BigIntegerField() + legacy_survey_dr8__ls_id = BigIntegerField() + panstarrs1__catid_objid = BigIntegerField() + ps1_g18__objid = BigIntegerField() + sdss_dr13_photoobj__objid = BigIntegerField() + skymapper_dr1_1__object_id = BigIntegerField() + skymapper_dr2__object_id = BigIntegerField() + supercosmos__objid = BigIntegerField() + tic_v8__id = BigIntegerField() + twomass_psc__pts_key = IntegerField() + tycho2__designation = TextField() + unwise__unwise_objid = TextField() allstar_dr17_synspec_rev1 = ForeignKeyField( AllStar_DR17_synspec_rev1, diff --git a/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py b/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py index e0f000a7..440615ed 100644 --- a/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py +++ b/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py @@ -10211,28 +10211,28 @@ class SDSS_ID_To_Catalog(Base): sdss_id = Column(Float) catalogid = Column(Float,) version_id = Column(Integer) - allstar_dr17_synspec_rev1_apstar_id = Column(String(20)) - allwise_cntr = Column(Float) - bhm_rm_v0_pk = Column(Float) - bhm_rm_v0_2_pk = Column(Float) - catwise_source_id = Column(String(20)) - catwise2020_source_id = Column(String(20)) - gaia_dr2_source_source_id = Column(Float) - gaia_dr3_source_source_id = Column(Float) - glimpse_pk = Column(Float) - guvcat_objid = Column(Float) - legacy_survey_dr10_ls_id = Column(Float) - legacy_survey_dr8_ls_id = Column(Float) - panstarrs1_catid_objid = Column(Float) - ps1_g18_objid = Column(Float) - sdss_dr13_photoobj_objid = Column(Float) - skymapper_dr1_1_object_id = Column(Float) - skymapper_dr2_object_id = Column(Float) - supercosmos_objid = Column(Float) - tic_v8_id = Column(Float) - twomass_psc_pts_key = Column(Integer) - tycho2_designation = Column(String(20)) - unwise_unwise_objid = Column(String(20)) + allstar_dr17_synspec_rev1__apstar_id = Column(String(20)) + allwise__cntr = Column(Float) + bhm_rm_v0__pk = Column(Float) + bhm_rm_v0_2__pk = Column(Float) + catwise__source_id = Column(String(20)) + catwise2020__source_id = Column(String(20)) + gaia_dr2_source__source_id = Column(Float) + gaia_dr3_source__source_id = Column(Float) + glimpse__pk = Column(Float) + guvcat__objid = Column(Float) + legacy_survey_dr10__ls_id = Column(Float) + legacy_survey_dr8__ls_id = Column(Float) + panstarrs1__catid_objid = Column(Float) + ps1_g18__objid = Column(Float) + sdss_dr13_photoobj__objid = Column(Float) + skymapper_dr1_1__object_id = Column(Float) + skymapper_dr2__object_id = Column(Float) + supercosmos__objid = Column(Float) + tic_v8__id = Column(Float) + twomass_psc__pts_key = Column(Integer) + tycho2__designation = Column(String(20)) + unwise__unwise_objid = Column(String(20)) allstar_dr17_synspec_rev1__apstar_id = Column( ForeignKey('catalogdb.allstar_dr17_synspec_rev1.apstar_id'), From efbd63f6cc36e3752dea43cb6ba3fe40136db9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20S=C3=A1nchez-Gallego?= Date: Fri, 2 Aug 2024 22:24:00 -0600 Subject: [PATCH 2/3] Fix definition of SQLA ToO PKs --- python/sdssdb/sqlalchemy/sdss5db/catalogdb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py b/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py index 440615ed..9c0ad858 100644 --- a/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py +++ b/python/sdssdb/sqlalchemy/sdss5db/catalogdb.py @@ -10159,7 +10159,7 @@ class TESS_TOI(Base): class ToO_Target(Base): __tablename__ = 'too_target' - too_id = Column(BigInteger(primary_key=True)) + too_id = Column(BigInteger, primary_key=True) fiber_type = Column(String(20)) catalogid = Column(Integer) sdss_id = Column(Integer) @@ -10180,7 +10180,7 @@ class ToO_Target(Base): class ToO_Metadata(Base): __tablename__ = 'too_metadata' - too_id = Column(BigInteger(primary_key=True)) + too_id = Column(BigInteger, primary_key=True) sky_brightness_mode = Column(String(20)) lambda_eff = Column(Float) u_mag = Column(Float) From 4ebf2b9f5bb2754b2454d23cb02735a4f4dabcc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20S=C3=A1nchez-Gallego?= Date: Fri, 2 Aug 2024 22:25:56 -0600 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 050ec46b..61b54b61 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,8 @@ Changelog This document records the main changes to the ``sdssdb`` code. * One more attempt at fixing the various issues with reflection. Reloading the fields each time a table was not found worked well for ``operations`` but not so much for ``pipelines`` because so many tables are missing. This time, we will only refresh the fields if the table is not found in the schema metadata *and* it exists in the database. +* Fixed column names in ``SDSS_ID_To_Catalog`` models (#260). +* Adds new column to ``vizdb.sdssid_to_pipes`` view (#259). * :release:`0.12.1 <2024-07-29>` * Use Markdown for the README file. The old README.rst was giving trouble when packaging the app.