Update ID matching to match by name sometimes

src/plugins/expressions/common/expression_functions/specs/map_column.ts

@@ -103,10 +103,14 @@ export const mapColumn: ExpressionFunctionDefinition<
  return Promise.all(rowPromises).then((rows) => {
  const existingColumnIndex = columns.findIndex(({ id, name }) => {
  // Columns that have IDs are allowed to have duplicate names, for example esaggs
+ if (args.id) {
+ return id === args.id;
+ }
+ // If the column has an ID, but there is no ID argument to mapColumn
  if (id) {
- return id === args.id && name === args.name;
+ return id === args.name;
  }
- // If no ID, name is the unique key. For example, SQL output does not have IDs
+ // Columns without ID use name as the unique key. For example, SQL output does not have IDs
  return name === args.name;
  });
  const type = rows.length ? getType(rows[0][columnId]) : 'null';

src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts

@@ -35,6 +35,18 @@ describe('mapColumn', () => {
  expect(result.rows[arbitraryRowIndex]).toHaveProperty('pricePlusTwo');
  });
 
+ it('matches name to id when mapColumn is called without an id', async () => {
+ const result = await runFn(testTable, { name: 'name', expression: pricePlusTwo });
+ const nameColumnIndex = result.columns.findIndex(({ name }) => name === 'name');
+ const arbitraryRowIndex = 4;
+
+ expect(result.type).toBe('datatable');
+ expect(result.columns).toHaveLength(sqlTable.columns.length);
+ expect(result.columns[nameColumnIndex]).toHaveProperty('name', 'name');
+ expect(result.columns[nameColumnIndex].meta).toHaveProperty('type', 'number');
+ expect(result.rows[arbitraryRowIndex]).toHaveProperty('name', 202);
+ });
+
  it('overwrites existing column with the new column if an existing column name is missing an id', async () => {
  const result = await runFn(sqlTable, { name: 'name', expression: pricePlusTwo });
  const nameColumnIndex = result.columns.findIndex(({ name }) => name === 'name');