Update model for AllStarMerge

sdss · Jun 2, 2020 · 21b1b4a · 21b1b4a
1 parent ffcf159
commit 21b1b4a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/schema/sdss5db/catalogdb/sdssApogeeAllStarMerge/r13/AllStarMerge.sql b/schema/sdss5db/catalogdb/sdssApogeeAllStarMerge/r13/AllStarMerge.sql
@@ -10,7 +10,7 @@ Catalogue generated via IDL script: aporbitprep_mergestar.pro
 */
 
 CREATE TABLE catalogdb.sdss_apogeeAllStarMerge_r13 (
-    apogee_id VARCHAR(18) PRIMARY KEY,
+    apogee_id TEXT,
     nvisits SMALLINT,
     nentries INTEGER,
     ra DOUBLE PRECISION,
@@ -19,7 +19,7 @@ CREATE TABLE catalogdb.sdss_apogeeAllStarMerge_r13 (
     glat DOUBLE PRECISION,
     pmra DOUBLE PRECISION,
     pmdec DOUBLE PRECISION,
-    pm_src VARCHAR(4),
+    pm_src TEXT,
     j REAL,
     j_err REAL,
     h REAL,
@@ -56,29 +56,29 @@ CREATE TABLE catalogdb.sdss_apogeeAllStarMerge_r13 (
     param_cov REAL[9][9],
     fparam REAL[9],
     fparam_cov REAL[9][9],
-    param_symbol VARCHAR(15)[9],
+    param_symbol TEXT[9],
     x_h REAL[26],
     x_h_err REAL[26],
     felem REAL[26],
     felem_err REAL[26],
-    elem_symbol VARCHAR(4)[26],
+    elem_symbol TEXT[26],
     felemtoh SMALLINT[31],
-    startype VARCHAR(1),
+    startype TEXT,
     vjitter REAL,
     dist REAL,
     dist_err REAL,
-    dist_src VARCHAR(1),
-    dist_srclist VARCHAR(1),
+    dist_src TEXT,
+    dist_srclist TEXT,
     mstar REAL,
     mstar_err REAL,
     rstar REAL,
     rstar_err REAL,
-    mstar_src VARCHAR(1),
-    jd DOUBLE PRECISION[60],
-    rv DOUBLE PRECISION[60],
-    rv_err DOUBLE PRECISION[60],
-    rv_src VARCHAR(6)[60],
-    snr REAL[60],
-    fiberid SMALLINT[60],
-    visit_pk INTEGER[60]
+    mstar_src TEXT,
+    jd DOUBLE PRECISION[65],
+    rv DOUBLE PRECISION[65],
+    rv_err DOUBLE PRECISION[65],
+    rv_src TEXT[65],
+    snr REAL[65],
+    fiberid SMALLINT[65],
+    visit_pk INTEGER[65]
 );
diff --git a/schema/sdss5db/catalogdb/sdssApogeeAllStarMerge/r13/AllStarMerge_load.py b/schema/sdss5db/catalogdb/sdssApogeeAllStarMerge/r13/AllStarMerge_load.py
@@ -19,13 +19,15 @@
 
 def main():
 
-    file_ = os.environ['CATALOGDB_DIR'] + 'sdssApogeeAllStarMerge/r13/allStarMerge-r13-l33-58814.fits'  # noqa
+    file_ = os.environ['CATALOGDB_DIR'] + '/sdssApogeeAllStarMerge/r13/allStarMerge-r13-l33-58932beta.fits'  # noqa
 
-    data = astropy.table.Table.read(file_)
-    data.meta = {}
-    data.rename_columns(data.colnames, list(map(lambda x: x.lower(), data.colnames)))
-    to_csv(data, file_ + '.csv', header=True)
-    del data
+    # data = astropy.table.Table.read(file_)
+    # data.meta = {}
+    # data.rename_columns(data.colnames, list(map(lambda x: x.lower(), data.colnames)))
+    # to_csv(data, file_ + '.csv', header=True)
+    # del data
+
+    database.become_admin()
 
     cursor = database.cursor()
     fileobj = open(file_ + '.csv')