Skip to content

Commit

Permalink
Merge pull request #212 from lsst/tickets/DM-43946
Browse files Browse the repository at this point in the history
DM-43946: Fix lengths and datatypes of string columns, primarily in ObsCore schemas
  • Loading branch information
JeremyMcCormick authored May 3, 2024
2 parents 4a202e4 + f8d6ad5 commit 3bfaa3c
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 53 deletions.
53 changes: 27 additions & 26 deletions yml/dp02_obscore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ tables:
tap:principal: 1
tap:column_index: 10
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: dataproduct_subtype
"@id": "ObsCore.dataproduct_subtype"
description: Data product specific type
Expand All @@ -31,8 +31,8 @@ tables:
tap:principal: 1
tap:column_index: 20
ivoa:unit:
datatype: char
votable:arraysize: 64
datatype: string
length: 64
- name: obs_title
"@id": "ObsCore.obs_title"
description: Brief description of dataset in free format
Expand All @@ -43,7 +43,8 @@ tables:
tap:principal: 1
tap:column_index: 225
ivoa:unit:
datatype: char
datatype: string
length: 256
votable:arraysize: "*"
- name: facility_name
"@id": "ObsCore.facility_name"
Expand All @@ -55,8 +56,8 @@ tables:
tap:principal: 1
tap:column_index: 210
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: calib_level
"@id": "ObsCore.calib_level"
description: "Calibration level of the observation: in {0, 1, 2, 3, 4}"
Expand All @@ -78,8 +79,8 @@ tables:
tap:principal: 0
tap:column_index: 270
ivoa:unit:
datatype: char
votable:arraysize: 32
datatype: string
length: 32
- name: obs_id
"@id": "ObsCore.obs_id"
description: Internal ID given by the ObsTAP service
Expand All @@ -90,8 +91,8 @@ tables:
tap:principal: 1
tap:column_index: 180
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: obs_collection
"@id": "ObsCore.obs_collection"
description: Name of the data collection
Expand All @@ -102,8 +103,8 @@ tables:
tap:principal: 1
tap:column_index: 190
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: obs_publisher_did
"@id": "ObsCore.obs_publisher_did"
description: ID for the Dataset given by the publisher
Expand All @@ -114,8 +115,8 @@ tables:
tap:principal: 0
tap:column_index: 260
ivoa:unit:
datatype: char
votable:arraysize: 256
datatype: string
length: 256
- name: access_url
"@id": "ObsCore.access_url"
description: URL used to access dataset
Expand All @@ -126,7 +127,7 @@ tables:
tap:principal: 1
tap:column_index: 240
ivoa:unit:
datatype: char
datatype: text
votable:arraysize: "*"
votable:xtype: clob
- name: access_format
Expand All @@ -139,8 +140,8 @@ tables:
tap:principal: 1
tap:column_index: 250
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: s_ra
"@id": "ObsCore.s_ra"
description: Central Spatial Position in ICRS; Right ascension
Expand Down Expand Up @@ -184,8 +185,8 @@ tables:
tap:principal: 1
tap:column_index: 230
ivoa:unit:
datatype: char
votable:arraysize: 512
datatype: string
length: 512
- name: s_resolution
"@id": "ObsCore.s_resolution"
description: Spatial resolution of data as FWHM of PSF
Expand Down Expand Up @@ -328,8 +329,8 @@ tables:
tap:principal: 1
tap:column_index: 200
ivoa:unit:
datatype: char
votable:arraysize: 32
datatype: string
length: 32
- name: pol_xel
"@id": "ObsCore.pol_xel"
description: Number of elements along the polarization axis
Expand All @@ -351,8 +352,8 @@ tables:
tap:principal: 1
tap:column_index: 220
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: lsst_visit
"@id": "ObsCore.lsst_visit"
description: Identifier for a specific LSSTCam pointing
Expand Down Expand Up @@ -418,7 +419,7 @@ tables:
tap:principal: 1
tap:column_index: 40
ivoa:unit:
datatype: char
datatype: string
length: 10
votable:arraysize: 10
- name: lsst_filter
Expand All @@ -431,6 +432,6 @@ tables:
tap:principal: 1
tap:column_index: 90
ivoa:unit:
datatype: char
datatype: string
length: 10
votable:arraysize: 10
2 changes: 1 addition & 1 deletion yml/imsim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8031,7 +8031,7 @@ tables:
- name: band
"@id": "#ForcedSourceOnDiaObject.band"
datatype: char
mysql:datatype: CHAR(1)
length: 1
description: Abstract filter that is not associated with a particular instrument
fits:tunit:
- name: ccdVisitId
Expand Down
2 changes: 1 addition & 1 deletion yml/obsloctap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ tables:
tap:column_index: 17
ivoa:unit:
datatype: string
votable:arraysize: "*"
length: 40
votable:arraysize: "*"
- name: pol_states
"@id": "#ObsPlan.pol_states"
description: List of polarization states or NULL if not applicable
Expand Down
50 changes: 25 additions & 25 deletions yml/oga_live_obscore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ tables:
tap:principal: 1
tap:column_index: 10
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: dataproduct_subtype
"@id": "ObsCore.dataproduct_subtype"
description: Data product specific type
Expand All @@ -31,8 +31,8 @@ tables:
tap:principal: 1
tap:column_index: 20
ivoa:unit:
datatype: char
votable:arraysize: 64
datatype: string
length: 64
- name: facility_name
"@id": "ObsCore.facility_name"
description: The name of the facility, telescope, or space craft used for the observation
Expand All @@ -43,8 +43,8 @@ tables:
tap:principal: 1
tap:column_index: 210
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: calib_level
"@id": "ObsCore.calib_level"
description: "Calibration level of the observation: in {0, 1, 2, 3, 4}"
Expand All @@ -66,8 +66,8 @@ tables:
tap:principal: 0
tap:column_index: 270
ivoa:unit:
datatype: char
votable:arraysize: 32
datatype: string
length: 32
- name: obs_id
"@id": "ObsCore.obs_id"
description: Internal ID given by the ObsTAP service
Expand All @@ -78,8 +78,8 @@ tables:
tap:principal: 1
tap:column_index: 180
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: obs_collection
"@id": "ObsCore.obs_collection"
description: Name of the data collection
Expand All @@ -90,8 +90,8 @@ tables:
tap:principal: 1
tap:column_index: 190
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: obs_publisher_did
"@id": "ObsCore.obs_publisher_did"
description: ID for the Dataset given by the publisher
Expand All @@ -102,8 +102,8 @@ tables:
tap:principal: 0
tap:column_index: 260
ivoa:unit:
datatype: char
votable:arraysize: 256
datatype: string
length: 256
- name: access_url
"@id": "ObsCore.access_url"
description: URL used to access dataset
Expand All @@ -114,7 +114,7 @@ tables:
tap:principal: 1
tap:column_index: 240
ivoa:unit:
datatype: char
datatype: text
votable:arraysize: "*"
votable:xtype: clob
- name: access_format
Expand All @@ -127,8 +127,8 @@ tables:
tap:principal: 1
tap:column_index: 250
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: s_ra
"@id": "ObsCore.s_ra"
description: Central Spatial Position in ICRS; Right ascension
Expand Down Expand Up @@ -172,8 +172,8 @@ tables:
tap:principal: 1
tap:column_index: 230
ivoa:unit:
datatype: char
votable:arraysize: 512
datatype: string
length: 512
- name: s_resolution
"@id": "ObsCore.s_resolution"
description: Spatial resolution of data as FWHM of PSF
Expand Down Expand Up @@ -316,8 +316,8 @@ tables:
tap:principal: 1
tap:column_index: 200
ivoa:unit:
datatype: char
votable:arraysize: 32
datatype: string
length: 32
- name: pol_xel
"@id": "ObsCore.pol_xel"
description: Number of elements along the polarization axis
Expand All @@ -339,8 +339,8 @@ tables:
tap:principal: 1
tap:column_index: 220
ivoa:unit:
datatype: char
votable:arraysize: 128
datatype: string
length: 128
- name: lsst_visit
"@id": "ObsCore.lsst_visit"
description: Identifier for a specific LSSTCam pointing
Expand Down Expand Up @@ -395,7 +395,7 @@ tables:
tap:principal: 1
tap:column_index: 40
ivoa:unit:
datatype: char
datatype: string
length: 10
votable:arraysize: 10
- name: lsst_filter
Expand All @@ -408,6 +408,6 @@ tables:
tap:principal: 1
tap:column_index: 90
ivoa:unit:
datatype: char
datatype: string
length: 10
votable:arraysize: 10

0 comments on commit 3bfaa3c

Please sign in to comment.