Merge branch 'main' into gh-24654

aws · Apr 12, 2023 · 5fa2f09 · 5fa2f09
2 parents 309eda1 + 8a655bd
commit 5fa2f09
Show file tree

Hide file tree

Showing 29 changed files with 1,464 additions and 1,856 deletions.
diff --git a/packages/@aws-cdk/aws-redshift/lib/table.ts b/packages/@aws-cdk/aws-redshift/lib/table.ts
@@ -242,7 +242,6 @@ export class Table extends TableBase {
   constructor(scope: Construct, id: string, props: TableProps) {
     super(scope, id);
 
-    this.addColumnIds(props.tableColumns);
     this.validateDistKeyColumns(props.tableColumns);
     if (props.distStyle) {
       this.validateDistStyle(props.distStyle, props.tableColumns);
@@ -251,7 +250,7 @@ export class Table extends TableBase {
       this.validateSortStyle(props.sortStyle, props.tableColumns);
     }
 
-    this.tableColumns = props.tableColumns;
+    this.tableColumns = this.configureTableColumns(props.tableColumns);
     this.cluster = props.cluster;
     this.databaseName = props.databaseName;
 
@@ -327,16 +326,25 @@ export class Table extends TableBase {
     return (sortKeyColumns.length === 0) ? TableSortStyle.AUTO : TableSortStyle.COMPOUND;
   }
 
-  private addColumnIds(columns: Column[]): void {
+  private configureTableColumns(columns: Column[]): Column[] {
+    const newColumns = [...columns];
     const columnIds = new Set<string>();
-    for (const column of columns) {
+    for (let i = 0; i < columns.length; i++) {
+      const column = newColumns[i];
       if (column.id) {
         if (columnIds.has(column.id)) {
           throw new Error(`Column id '${column.id}' is not unique.`);
         }
         columnIds.add(column.id);
+      } else {
+        if (columnIds.has(column.name)) {
+          throw new Error(`Column name '${column.name}' is not unique amongst the column ids.`);
+        }
+        newColumns[i] = { ...column, id: column.name };
+        columnIds.add(column.name);
       }
     }
+    return newColumns;
   }
 }
 

diff --git a/packages/@aws-cdk/aws-redshift/test/integ.database-columnid.ts b/packages/@aws-cdk/aws-redshift/test/integ.database-columnid.ts
@@ -48,7 +48,7 @@ new redshift.Table(stack, 'Table', {
   tableColumns: [
     { id: 'col1', name: 'col1', dataType: 'varchar(4)' },
     { id: 'col2', name: 'col2', dataType: 'float' },
-    { id: 'col3', name: 'col3', dataType: 'float' },
+    { name: 'col3', dataType: 'float' },
   ],
 });
 

diff --git a/....snapshot/asset.169a8c0beb97c903ee155ea9653e39b0884c9e3b860ac72ffbe906b3c1f4e338/table.js b/....snapshot/asset.169a8c0beb97c903ee155ea9653e39b0884c9e3b860ac72ffbe906b3c1f4e338/table.js
diff --git a/...b860ac72ffbe906b3c1f4e338/handler-name.js → ...56daa51073d4149a3080c5f79/handler-name.js b/...b860ac72ffbe906b3c1f4e338/handler-name.js → ...56daa51073d4149a3080c5f79/handler-name.js
diff --git a/...884c9e3b860ac72ffbe906b3c1f4e338/index.js → ...884de7656daa51073d4149a3080c5f79/index.js b/...884c9e3b860ac72ffbe906b3c1f4e338/index.js → ...884de7656daa51073d4149a3080c5f79/index.js
diff --git a/...e3b860ac72ffbe906b3c1f4e338/privileges.js → ...7656daa51073d4149a3080c5f79/privileges.js b/...e3b860ac72ffbe906b3c1f4e338/privileges.js → ...7656daa51073d4149a3080c5f79/privileges.js
diff --git a/...860ac72ffbe906b3c1f4e338/redshift-data.js → ...6daa51073d4149a3080c5f79/redshift-data.js b/...860ac72ffbe906b3c1f4e338/redshift-data.js → ...6daa51073d4149a3080c5f79/redshift-data.js
diff --git a/....snapshot/asset.1a159599b617b432864ddf9e4e9ec70b884de7656daa51073d4149a3080c5f79/table.js b/....snapshot/asset.1a159599b617b432864ddf9e4e9ec70b884de7656daa51073d4149a3080c5f79/table.js
diff --git a/...884c9e3b860ac72ffbe906b3c1f4e338/types.js → ...884de7656daa51073d4149a3080c5f79/types.js b/...884c9e3b860ac72ffbe906b3c1f4e338/types.js → ...884de7656daa51073d4149a3080c5f79/types.js
diff --git a/...0884c9e3b860ac72ffbe906b3c1f4e338/user.js → ...b884de7656daa51073d4149a3080c5f79/user.js b/...0884c9e3b860ac72ffbe906b3c1f4e338/user.js → ...b884de7656daa51073d4149a3080c5f79/user.js
diff --git a/...0884c9e3b860ac72ffbe906b3c1f4e338/util.js → ...b884de7656daa51073d4149a3080c5f79/util.js b/...0884c9e3b860ac72ffbe906b3c1f4e338/util.js → ...b884de7656daa51073d4149a3080c5f79/util.js
diff --git a/...ot/asset.847e15feeb180b356ab9a8094d8b9459ea8ec26fc27957794d583ed9eb3a79d8/handler-name.js b/...ot/asset.847e15feeb180b356ab9a8094d8b9459ea8ec26fc27957794d583ed9eb3a79d8/handler-name.js
diff --git a/....snapshot/asset.847e15feeb180b356ab9a8094d8b9459ea8ec26fc27957794d583ed9eb3a79d8/index.js b/....snapshot/asset.847e15feeb180b356ab9a8094d8b9459ea8ec26fc27957794d583ed9eb3a79d8/index.js
diff --git a/...shot/asset.847e15feeb180b356ab9a8094d8b9459ea8ec26fc27957794d583ed9eb3a79d8/privileges.js b/...shot/asset.847e15feeb180b356ab9a8094d8b9459ea8ec26fc27957794d583ed9eb3a79d8/privileges.js