Merge pull request #43 from lsst-sqre/tickets/DM-25428

[DM-25428] Fix desc_dc2_run12p_v4e.ccdvisit type
lsst-sqre · Jun 24, 2020 · 8acafd8 · 8acafd8
2 parents c05d247 + 53ef058
commit 8acafd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ group: edge
 dist: trusty
 
 jdk:
-  - openjdk7
+  - openjdk8
   - oraclejdk8
 
 services:

diff --git a/docker/tap-schema/1007_desc_dc2_run12_v4.sql b/docker/tap-schema/1007_desc_dc2_run12_v4.sql
@@ -123,7 +123,7 @@ INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize,
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'ccdname', 'char', 3, null, 'Ccd name.', null, null, 'meta.id;instr.det', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'raftname', 'char', 3, null, 'Raft name.', null, null, 'meta.id;instr.det', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'filtername', 'char', 1, null, 'Filter name used for this exposure.', null, null, 'meta.id;instr.filter', 0, 0, 0, null);
-INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'obsstart', 'string', null, null, 'Start of the exposure, TAI, accurate to 10ms.', null, null, 'time.start', 0, 0, 0, null);
+INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'obsstart', 'char', 20, null, 'Start of the exposure, TAI, accurate to 10ms.', null, null, 'time.start', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'expmidpt', 'double', null, null, 'Midpoint for exposure. TAI, accurate to 10ms.', null, null, 'time.epoch', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'exptime', 'double', null, null, 'Average duration of exposure, accurate to 10ms.', null, 's', 'time.duration', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('desc_dc2_run12p_v4e.ccdvisit', 'zeropoint', 'float', null, null, 'Zero-point for the Ccd, estimated at Ccd center.', null, null, null, 0, 0, 0, null);