Bug Fix: Merge PR #1089 from brianv0/u/bvan/fix-table

Bug Fix: Fix ADQL query generation

Author: robyww

src/firefly/js/ui/tap/ColumnConstraintsPanel.jsx

@@ -93,10 +93,12 @@ export function getTableConstraints(tbl_id) {
 
     // collect the names of all selected columns
     let allSelected = true;
+    let selcolsArray = [];
     let selcolsFragment = tbl_data.reduce((prev, d, idx) => {
             if ((sel_info.selectAll && (!sel_info.exceptions.has(idx))) ||
                 (!sel_info.selectAll && (sel_info.exceptions.has(idx)))) {
                 prev += d[0] + ',';
+                selcolsArray.push(d[0]);
             } else {
                 allSelected = false;
             }
@@ -107,7 +109,7 @@ export function getTableConstraints(tbl_id) {
         selcolsFragment = '';
     }
 
-    return {whereFragment, selcolsFragment, errors, filters};
+    return {whereFragment, selcolsFragment, errors, filters, selcolsArray};
 }
 
 /**

src/firefly/js/ui/tap/TableColumnsConstraints.jsx

@@ -215,5 +215,5 @@ export function tableColumnsConstraints(columnsModel) {
     const colsToSelect = selcolsFragment.lastIndexOf(',') > 0 ?
         selcolsFragment.substring(0, selcolsFragment.lastIndexOf(',')) : selcolsFragment;
 
-    return {valid: true, where: whereFragment, selcols: (colsToSelect.length > 0) ? colsToSelect : ''};
+    return {valid: true, where: whereFragment, selcols: (colsToSelect.length > 0) ? colsToSelect : '', selcolsArray: tableconstraints.selcolsArray};
 }

src/firefly/js/ui/tap/TableSelectViewPanel.jsx

@@ -266,6 +266,7 @@ export function BasicUI(props) {
                             value={tableName}
                             onSelect={(selectedTapTable) => {
                                 setTableName(selectedTapTable);
+                                dispatchValueChange({groupKey: gkey, fieldKey: 'tableName', value: selectedTapTable});
                             }}
                         />
                     </div>

src/firefly/js/ui/tap/TapSearchRootPanel.jsx

@@ -28,6 +28,7 @@ import { gkey, SectionTitle, AdqlUI, BasicUI} from 'firefly/ui/tap/TableSelectVi
 
 
 const SERVICE_TIP= 'Select a TAP service, or type to enter the URL of any other TAP service';
+const ADQL_LINE_LENGTH = 100;
 
 //-------------
 //-------------
@@ -338,7 +339,24 @@ function getAdqlQuery(showErrors= true) {
     if (adqlFragment.where) {
         constraints += (addAnd ? ' AND ' : '') + `(${adqlFragment.where})`;
     }
-    const selcols = adqlFragment.selcols || '*';
+    let selcols = adqlFragment.selcols || '*';
+
+    // If the line is long, rebuild the line from array of column names
+    // breaking at ADQL_LINE_LENGTH
+    if (selcols.length > ADQL_LINE_LENGTH) {
+        selcols = '';
+        let line = adqlFragment.selcolsArray[0];
+        const colsCopy = adqlFragment.selcolsArray.slice(1);
+        colsCopy.forEach((value) => {
+            const nextColumn = ',' + value;
+            if ((line + nextColumn).length > ADQL_LINE_LENGTH){
+                selcols += line + '\n';
+                line = '    ';
+            }
+            line += nextColumn;
+        });
+        selcols += line;
+    }
 
     if (constraints) {
         constraints = `WHERE ${constraints}`;
@@ -347,5 +365,5 @@ function getAdqlQuery(showErrors= true) {
     // if we use TOP  when maxrec is set `${maxrec ? `TOP ${maxrec} `:''}`,
     // overflow indicator will not be included with the results
     // and we will not know if the results were truncated
-    return `SELECT ${selcols} FROM ${tableName} ${constraints}`;
+    return `SELECT ${selcols} \nFROM ${tableName} \n${constraints}`;
 }