Skip to content

Commit

Permalink
Merge pull request #208 from lsst/tickets/DM-43956
Browse files Browse the repository at this point in the history
DM-43956: Remove all redundant overrides of fixed length strings
  • Loading branch information
JeremyMcCormick committed Apr 24, 2024
2 parents 9eabf96 + 2fd8f36 commit a628512
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 45 deletions.
3 changes: 0 additions & 3 deletions yml/apdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,6 @@ tables:
datatype: string
length: 64
description: External catalog name of the nearest low-z potential host.
mysql:datatype: VARCHAR(64)
- name: nearbyLowzGalSep
"@id": "#DiaObject.nearbyLowzGalSep"
datatype: float
Expand Down Expand Up @@ -2055,7 +2054,6 @@ tables:
datatype: char
length: 1
description: Filter band this source was observed with.
mysql:datatype: CHAR(1)
- name: isDipole
"@id": "#DiaSource.isDipole"
datatype: boolean
Expand Down Expand Up @@ -2172,7 +2170,6 @@ tables:
length: 1
description: Filter band this source was observed with.
ivoa:ucd: meta.id;instr.filter
mysql:datatype: CHAR(1)
- name: time_processed
"@id": "#DiaForcedSource.time_processed"
datatype: timestamp
Expand Down
3 changes: 0 additions & 3 deletions yml/dp01_dc2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7266,7 +7266,6 @@ tables:
'@id': '#object.patch'
datatype: char
length: 3
mysql:datatype: CHAR(3)
tap:column_index: 999
tap:principal: 1
description: patch ID
Expand Down Expand Up @@ -8182,7 +8181,6 @@ tables:
'@id': '#truth_match.id'
datatype: char
length: 20
mysql:datatype: CHAR(20)
tap:column_index: 1
tap:principal: 1
description: Unique object ID
Expand Down Expand Up @@ -8329,7 +8327,6 @@ tables:
'@id': '#truth_match.patch'
datatype: char
length: 3
mysql:datatype: CHAR(3)
tap:column_index: 999
tap:principal: 1
description: Patch ID in Sky Map (as a string, x,y)
Expand Down
17 changes: 0 additions & 17 deletions yml/dp02_dc2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ tables:
datatype: char
length: 1
description: Reference band - parameters measured on coadds of this band were used for multi-band forced photometry
mysql:datatype: CHAR(1)
fits:tunit:
votable:arraysize: "*"
ivoa:ucd: meta.id;instr.filter;meta.main
Expand Down Expand Up @@ -143,7 +142,6 @@ tables:
datatype: char
description: Name of skymap used for coadd projection
length: 12
mysql:datatype: CHAR(12)
fits:tunit:
- name: tract
"@id": "#Object.tract"
Expand Down Expand Up @@ -5696,15 +5694,13 @@ tables:
datatype: char
length: 1
description: Name of the band used to take the exposure where this source was measured. Abstract filter that is not associated with a particular instrument
mysql:datatype: CHAR(1)
fits:tunit:
votable:arraysize: "*"
- name: instrument
"@id": "#Source.instrument"
datatype: char
description: ID of instrument, the entity that produces observations.
length: 13
mysql:datatype: CHAR(13)
fits:tunit:
- name: detector
"@id": "#Source.detector"
Expand All @@ -5716,7 +5712,6 @@ tables:
datatype: char
description: ID of physical filter, the filter associated with a particular instrument.
length: 9
mysql:datatype: CHAR(9)
fits:tunit:
- name: visit_system
"@id": "#Source.visit_system"
Expand Down Expand Up @@ -5789,7 +5784,6 @@ tables:
"@id": "#ForcedSource.skymap"
datatype: char
length: 12
mysql:datatype: CHAR(12)
description: Name of skymap used for coadd projection
fits:tunit:
tap:principal: 0
Expand All @@ -5814,7 +5808,6 @@ tables:
"@id": "#ForcedSource.band"
datatype: char
length: 1
mysql:datatype: CHAR(1)
description: Abstract filter that is not associated with a particular instrument
fits:tunit:
votable:arraysize: "*"
Expand Down Expand Up @@ -6762,7 +6755,6 @@ tables:
"@id": "#DiaSource.filterName"
datatype: char
length: 1
mysql:datatype: CHAR(1)
description: Band used to take this observation
fits:tunit:
- name: forced_PsfFlux_flag
Expand Down Expand Up @@ -7020,7 +7012,6 @@ tables:
"@id": "#ForcedSourceOnDiaObject.band"
datatype: char
length: 1
mysql:datatype: CHAR(1)
description: Abstract filter that is not associated with a particular instrument
fits:tunit:
votable:arraysize: "*"
Expand Down Expand Up @@ -7295,7 +7286,6 @@ tables:
"@id": "#ForcedSourceOnDiaObject.skymap"
datatype: char
length: 12
mysql:datatype: CHAR(12)
description: Name of skymap used for coadd projection
fits:tunit:
tap:principal: 0
Expand Down Expand Up @@ -7349,7 +7339,6 @@ tables:
description: Name of the band used to take the exposure where this source was measured.
Abstract filter that is not associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(1)
fits:tunit:
ivoa:ucd: meta.id;instr.bandpass
tap:principal: 1
Expand Down Expand Up @@ -7484,7 +7473,6 @@ tables:
length: 32
description: ID of physical filter, the filter associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(32)
fits:tunit:
ivoa:ucd: meta.id;instr.filter
tap:principal: 0
Expand All @@ -7496,7 +7484,6 @@ tables:
description: Name of the band used to take the exposure where this source was measured.
Abstract filter that is not associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(1)
fits:tunit:
ivoa:ucd: meta.id;instr.bandpass
tap:principal: 1
Expand Down Expand Up @@ -7822,7 +7809,6 @@ tables:
'@id': '#MatchesTruth.id'
datatype: char
length: 16
mysql:datatype: CHAR(16)
tap:column_index: 999
tap:principal: 0
description: id for TruthSummary source. Potentially non-unique; use id_truth_type for JOINs.
Expand All @@ -7845,7 +7831,6 @@ tables:
'@id': '#MatchesTruth.id_truth_type'
datatype: char
length: 18
mysql:datatype: CHAR(18)
tap:column_index: 2
tap:principal: 1
description: Combination of TruthSummary id and truth_type fields, used for JOINs.
Expand Down Expand Up @@ -7906,7 +7891,6 @@ tables:
'@id': '#TruthSummary.id_truth_type'
datatype: char
length: 22
mysql:datatype: CHAR(22)
tap:column_index: 0
tap:principal: 1
description: Combination of id and truth_type fields, used for JOINs with MatchesTruth.
Expand All @@ -7915,7 +7899,6 @@ tables:
'@id': '#TruthSummary.id'
datatype: char
length: 20
mysql:datatype: CHAR(20)
tap:column_index: 1
tap:principal: 1
description: Unique object ID
Expand Down
2 changes: 0 additions & 2 deletions yml/dp03_10yr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ tables:
datatype: char
description: MPC or simulation designation of the moving object
length: 20
mysql:datatype: CHAR(20)
- name: ssObjectReassocTime
"@id": "#DiaSource.ssObjectReassocTime"
datatype: timestamp
Expand Down Expand Up @@ -392,7 +391,6 @@ tables:
datatype: char
description: Name of the band used to take the exposure where this source was measured
length: 1
mysql:datatype: CHAR(1)
- name: mag
"@id": "#DiaSource.mag"
datatype: float
Expand Down
2 changes: 0 additions & 2 deletions yml/dp03_1yr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ tables:
datatype: char
description: MPC or simulation designation of the moving object
length: 20
mysql:datatype: CHAR(20)
- name: ssObjectReassocTime
"@id": "#DiaSource.ssObjectReassocTime"
datatype: timestamp
Expand Down Expand Up @@ -392,7 +391,6 @@ tables:
datatype: char
description: Name of the band used to take the exposure where this source was measured
length: 1
mysql:datatype: CHAR(1)
- name: mag
"@id": "#DiaSource.mag"
datatype: float
Expand Down
7 changes: 0 additions & 7 deletions yml/hsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ tables:
datatype: char
length: 1
description: Reference band - parameters measured on coadds of this band were used for multi-band forced photometry
mysql:datatype: CHAR(1)
fits:tunit:
- name: refExtendedness
"@id": "#Object.refExtendedness"
Expand Down Expand Up @@ -5815,7 +5814,6 @@ tables:
datatype: char
length: 1
description: Name of the band used to take the exposure where this source was measured. Abstract filter that is not associated with a particular instrument
mysql:datatype: CHAR(1)
fits:tunit:
- name: detector
"@id": "#Source.detector"
Expand All @@ -5827,7 +5825,6 @@ tables:
datatype: char
description: ID of physical filter, the filter associated with a particular instrument.
length: 5
mysql:datatype: CHAR(5)
fits:tunit:
- name: visit
"@id": "#Source.visit"
Expand All @@ -5850,7 +5847,6 @@ tables:
length: 32
description: ID of physical filter, the filter associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(32)
fits:tunit:
- name: band
'@id': '#Visit.band'
Expand All @@ -5859,7 +5855,6 @@ tables:
description: Name of the band used to take the visit where this source was measured.
Abstract filter that is not associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(1)
fits:tunit:
- name: ra
'@id': '#Visit.ra'
Expand Down Expand Up @@ -5953,7 +5948,6 @@ tables:
length: 32
description: ID of physical filter, the filter associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(32)
fits:tunit:
- name: band
'@id': '#CcdVisit.band'
Expand All @@ -5962,7 +5956,6 @@ tables:
description: Name of the band used to take the visit where this source was measured.
Abstract filter that is not associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(1)
fits:tunit:
- name: ra
'@id': '#CcdVisit.ra'
Expand Down
11 changes: 0 additions & 11 deletions yml/imsim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ tables:
datatype: char
length: 1
description: Reference band - parameters measured on coadds of this band were used for multi-band forced photometry
mysql:datatype: CHAR(1)
fits:tunit:
- name: refExtendedness
"@id": "#Object.refExtendedness"
Expand Down Expand Up @@ -6813,7 +6812,6 @@ tables:
datatype: char
length: 1
description: Name of the band used to take the exposure where this source was measured. Abstract filter that is not associated with a particular instrument
mysql:datatype: CHAR(1)
fits:tunit:
- name: detector
"@id": "#Source.detector"
Expand All @@ -6825,7 +6823,6 @@ tables:
datatype: char
description: ID of physical filter, the filter associated with a particular instrument.
length: 9
mysql:datatype: CHAR(9)
fits:tunit:
- name: visit
"@id": "#Source.visit"
Expand Down Expand Up @@ -6879,7 +6876,6 @@ tables:
"@id": "#ForcedSource.band"
datatype: char
length: 1
mysql:datatype: CHAR(1)
description: Abstract filter that is not associated with a particular instrument
fits:tunit:
- name: ccdVisitId
Expand Down Expand Up @@ -7716,7 +7712,6 @@ tables:
"@id": "#DiaSource.band"
datatype: char
length: 1
mysql:datatype: CHAR(1)
description: Band used to take this observation.
fits:tunit:
- name: forced_PsfFlux_flag
Expand Down Expand Up @@ -8253,7 +8248,6 @@ tables:
'@id': '#MatchesTruth.id'
datatype: char
length: 16
mysql:datatype: CHAR(16)
description: id for truth_summary source.
- name: truth_type
'@id': '#MatchesTruth.truth_type'
Expand Down Expand Up @@ -8283,7 +8277,6 @@ tables:
'@id': '#MatchesObject.match_id'
datatype: char
length: 16
mysql:datatype: CHAR(16)
description: id of matched truth_summary source, if any
- name: match_truth_type
'@id': '#MatchesObject.match_truth_type'
Expand All @@ -8309,7 +8302,6 @@ tables:
length: 32
description: ID of physical filter, the filter associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(32)
fits:tunit:
- name: band
'@id': '#Visit.band'
Expand All @@ -8318,7 +8310,6 @@ tables:
description: Name of the band used to take the visit where this source was measured.
Abstract filter that is not associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(1)
fits:tunit:
- name: ra
'@id': '#Visit.ra'
Expand Down Expand Up @@ -8412,7 +8403,6 @@ tables:
length: 32
description: ID of physical filter, the filter associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(32)
fits:tunit:
- name: band
'@id': '#CcdVisit.band'
Expand All @@ -8421,7 +8411,6 @@ tables:
description: Name of the band used to take the visit where this source was measured.
Abstract filter that is not associated with a particular instrument.
votable:arraysize: "*"
mysql:datatype: CHAR(1)
fits:tunit:
- name: ra
'@id': '#CcdVisit.ra'
Expand Down

0 comments on commit a628512

Please sign in to comment.