Firefly-1978: fixed VizieR upload

- response to feedback: fixed a bug

Author: robyww

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

@@ -6,7 +6,9 @@ import {useFieldGroupRerender, useFieldGroupValue, useFieldGroupWatch} from 'fir
 import {
     DebugObsCore, getPanelPrefix, makeCollapsibleCheckHeader, makeFieldErrorList, makePanelStatusUpdater
 } from 'firefly/ui/tap/TableSearchHelpers';
-import { ADQL_LINE_LENGTH, getAsEntryForTableName, makeUploadSchema, tapHelpId } from 'firefly/ui/tap/TapUtil';
+import {
+    makeFullyQualifiedColumn, ADQL_LINE_LENGTH, getTableNameAlias, makeUploadSchema, tapHelpId
+} from 'firefly/ui/tap/TapUtil';
 import {bool,string,object} from 'prop-types';
 import {ColsShape, getColValidator} from 'firefly/charts/ui/ColumnOrExpression';
 import {CheckboxGroupInputField} from '../CheckboxGroupInputField.jsx';
@@ -284,8 +286,8 @@ function makeObjectIDConstraints(fldObj, uploadInfo, tableName, canUpload, selec
         }
     }
     else if (!useSIAv2) {
-        const preFix= (serverFile && canUpload) ? `${getAsEntryForTableName(tableName)}` : '';
-        adqlConstraint = `(ut.${uploadedObjectID} = ${preFix}.${objectID})`;
+        const preFix= (serverFile && canUpload) ? getTableNameAlias(tableName) : '';
+        adqlConstraint = `(ut.${uploadedObjectID} = ${makeFullyQualifiedColumn(preFix,objectID)})`;
     }
 
     const errAry= errList.getErrors();

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

@@ -33,7 +33,8 @@ import {DebugObsCore, getPanelPrefix, makeCollapsibleCheckHeader, makeConstraint
     makeFieldErrorList} from './TableSearchHelpers.jsx';
 import {showUploadTableChooser} from '../UploadTableChooser.js';
 import {
-    getAsEntryForTableName, getColumnAttribute, getTapServiceByURL, makeUploadSchema, maybeQuote,
+    makeFullyQualifiedColumn,
+    getTableNameAlias, getColumnAttribute, getTapServiceByURL, makeUploadSchema, maybeQuote,
     tapHelpId
 } from './TapUtil.js';
 import {
@@ -712,7 +713,6 @@ function makeSpatialConstraints(columnsModel, obsCoreEnabled, fldObj, uploadInfo
     const errList= makeFieldErrorList();
     const tabAs= 'ut';
     const validUpload= Boolean(serverFile && upLonCol && upLatCol && canUpload);
-    const preFix= validUpload ? `${getAsEntryForTableName(tableName)}.` : '';
     if (!validUpload && spatialType===MULTI) {
         if (!serverFile) errList.addError('Upload file has not been specified');
         if (!upLonCol && !upLatCol) errList.addError('Upload columns have not been specified');
@@ -736,10 +736,10 @@ function makeSpatialConstraints(columnsModel, obsCoreEnabled, fldObj, uploadInfo
         const ucdCoord = getUCDCoord(columnsModel, cenLon);
         const worldSys = posCol[ucdCoord.key].coord;
         const adqlCoordSys = posCol[ucdCoord.key].adqlCoord;
-        const point = cenLon===cenLat ?
-            `${maybeQuote(preFix+cenLon)}` :
-            `POINT('${adqlCoordSys}', ${maybeQuote(preFix+cenLon)}, ${maybeQuote(preFix+cenLat)})`;
-
+        const preFix= (spatialType===MULTI) && validUpload ? getTableNameAlias(tableName) : '';
+        const lonColStr= makeFullyQualifiedColumn(preFix,cenLon);
+        const latColStr= makeFullyQualifiedColumn(preFix,cenLat);
+        const point = cenLon===cenLat ? lonColStr : `POINT('${adqlCoordSys}', ${lonColStr}, ${latColStr})`;
 
         if (spatialType===SINGLE) {
             if (!radiusSizeField?.value && spatialMethod === CONE_CHOICE_KEY) errList.addError('Missing radius input');

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

@@ -6,7 +6,7 @@ import {getCellValue, getColumn, getColumns, getColumnValues, getTblById, watchT
 import {SelectInfo} from '../../tables/SelectInfo.js';
 import {dispatchTableFilter, dispatchTableAddLocal, TABLE_LOADED, TABLE_REPLACE, TABLE_SELECT} from '../../tables/TablesCntlr.js';
 import {ColumnConstraintsPanel, getTableConstraints} from './ColumnConstraintsPanel.jsx';
-import {ADQL_LINE_LENGTH, maybeQuote} from './TapUtil.js';
+import {makeFullyQualifiedColumn, ADQL_LINE_LENGTH, maybeQuote} from './TapUtil.js';
 
 const COLS_TO_DISPLAY_FIRST = ['column_name','unit','ucd','description','datatype','arraysize','utype','xtype','principal'];
 
@@ -242,6 +242,8 @@ export function tableColumnsConstraints(columnsModel,tableName) {
     const {whereFragment, selcolsArray, errors} = tableConstraints;
     if (errors) return {valid: false, message: errors};
 
-    const selcols= tableName ? makeColsLines(selcolsArray.map( (c) => `${tableName}.${c}`)) : makeColsLines(selcolsArray);
+    const selcols= tableName
+        ? makeColsLines(selcolsArray.map( (c) => makeFullyQualifiedColumn(tableName, c)))
+        : makeColsLines(selcolsArray);
     return {valid: true, where: whereFragment, selcols, selcolsArray};
 }

src/firefly/js/ui/tap/TapSearchSubmit.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-    ADQL_QUERY_KEY, getAsEntryForTableName, getServiceHiPS, getServiceId, getServiceLabel,
+    ADQL_QUERY_KEY, getTableNameAlias, getServiceHiPS, getServiceId, getServiceLabel,
     makeTapSearchTitle,
     maybeQuote, TAP_UPLOAD_SCHEMA,
     USER_ENTERED_TITLE
@@ -137,15 +137,15 @@ export function getAdqlQuery(tapBrowserState, additionalClauses, allowColumnCons
     }
 
     const helperFragment = getHelperConstraints(tapBrowserState);
-    const tableAsName = getAsEntryForTableName(tableName); // alias is used when upload table is present
+    const tNameAlias = getTableNameAlias(tableName); // alias is used when upload table is present
     const tableCol = tableColumnsConstraints(tapBrowserState.columnsModel,
-        isUpload ? tableAsName : undefined);
+        isUpload ? tNameAlias : undefined);
 
     const { table:uploadTable, asTable:uploadAsTable, columns:uploadColumns} = isUpload ?
         getTapUploadSchemaEntry(tapBrowserState) : {};
 
     const fromTables= isUpload ?
-        `${tableName} AS ${tableAsName}, ${TAP_UPLOAD_SCHEMA}.${uploadTable} ${uploadAsTable ? 'AS '+uploadAsTable : ''}` :
+        `${tableName} AS ${tNameAlias}, ${TAP_UPLOAD_SCHEMA}.${uploadTable} ${uploadAsTable ? 'AS '+uploadAsTable : ''}` :
         tableName;
 
     // check for errors
@@ -159,7 +159,7 @@ export function getAdqlQuery(tapBrowserState, additionalClauses, allowColumnCons
     }
 
     // build columns
-    let selcols = tableCol.selcols || (isUpload ? `${tableAsName}.*` : '*');
+    let selcols = tableCol.selcols || (isUpload ? `${tNameAlias}.*` : '*');
     if (isUpload) {
         const ut= uploadAsTable ?? uploadTable ?? '';
         const tCol= uploadColumns.filter(({use}) => use).map( ({name}) => ut+'.'+name);

src/firefly/js/ui/tap/TapUtil.js

@@ -537,7 +537,12 @@ export function getColumnAttribute(columnsModel, colName, attrName) {
 
 const hasElements= (a) => Boolean(isArray(a) && a?.length);
 
-export const getAsEntryForTableName= (tableName) => tableName?.[0] ?? 'x';
+export function getTableNameAlias(tableName) {
+    if (!tableName) return 'x';
+    if (tableName.length > 1 && tableName[0]==='"') return tableName[1].toLowerCase();
+    if (tableName.length) return tableName[0].toLowerCase();
+    return 'x';
+}
 
 export function mergeServices(startingServices, additional) {
     if (!hasElements(additional)) return startingServices;
@@ -611,16 +616,19 @@ const validColumnNameRE=/^[A-Za-z][A-Za-z_0-9]*(\.[A-Za-z][A-Za-z_0-9]*){0,3}$/;
  */
 export function maybeQuote(name, isTable=false) {
     if (!name || (name.startsWith('"') && name.endsWith('"'))) return name;
+    if (!isTable && name.includes('.')) {
+        const [table,col, ...rest]= name.split('.');
+        const colPart= rest.length ? [col,...rest].join('.') : col;
+        if (table.length && colPart.length) return `${table}.${maybeQuote(colPart)}`;
+    }
     const re= isTable ? validTableNameRE : validColumnNameRE;
     return  (name.match(re)) ? name : `"${name}"`;
 }
 
-
-/**
- * group key for fieldgroup comp
- */
-
-
+export function makeFullyQualifiedColumn(tName, cName) {
+    if (!tName) return maybeQuote(cName);
+    return `${tName}.${maybeQuote(cName)}`;
+}