fix(redshift): tables were dropped on table name change

packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query-provider/table.ts

@@ -7,28 +7,38 @@ import { Column } from '../../table';
 
 export async function handler(props: TableAndClusterProps, event: AWSLambda.CloudFormationCustomResourceEvent) {
   const tableNamePrefix = props.tableName.prefix;
-  const tableNameSuffix = props.tableName.generateSuffix === 'true' ? `${event.RequestId.substring(0, 8)}` : '';
+  const tableNameSuffix = props.tableName.generateSuffix === 'true' ? `${event.StackId.substring(event.StackId.length - 12)}` : '';
   const tableColumns = props.tableColumns;
   const tableAndClusterProps = props;
   const useColumnIds = props.useColumnIds;
 
   if (event.RequestType === 'Create') {
     const tableName = await createTable(tableNamePrefix, tableNameSuffix, tableColumns, tableAndClusterProps);
-    return { PhysicalResourceId: tableName };
+    return {
+      PhysicalResourceId: tableName,
+      Data: { TableName: tableName },
+    };
   } else if (event.RequestType === 'Delete') {
-    await dropTable(event.PhysicalResourceId, tableAndClusterProps);
+    try {
+      await dropTable(event.PhysicalResourceId, tableAndClusterProps);
+    } catch {
+      await dropTable(tableNamePrefix + tableNameSuffix, tableAndClusterProps);
+    }
     return;
   } else if (event.RequestType === 'Update') {
     const tableName = await updateTable(
-      event.PhysicalResourceId,
+      event.OldResourceProperties?.Data?.TableName ?? event.PhysicalResourceId,
       tableNamePrefix,
       tableNameSuffix,
       tableColumns,
       useColumnIds,
       tableAndClusterProps,
       event.OldResourceProperties as TableAndClusterProps,
     );
-    return { PhysicalResourceId: tableName };
+    return {
+      PhysicalResourceId: event.PhysicalResourceId,
+      Data: { TableName: tableName },
+    };
   } else {
     /* eslint-disable-next-line dot-notation */
     throw new Error(`Unrecognized event type: ${event['RequestType']}`);
@@ -95,11 +105,6 @@ async function updateTable(
     return createTable(tableNamePrefix, tableNameSuffix, tableColumns, tableAndClusterProps);
   }
 
-  const oldTableNamePrefix = oldResourceProperties.tableName.prefix;
-  if (tableNamePrefix !== oldTableNamePrefix) {
-    return createTable(tableNamePrefix, tableNameSuffix, tableColumns, tableAndClusterProps);
-  }
-
   const oldTableColumns = oldResourceProperties.tableColumns;
   const columnDeletions = oldTableColumns.filter(oldColumn => (
     tableColumns.every(column => {
@@ -208,6 +213,12 @@ async function updateTable(
 
   await Promise.all(alterationStatements.map(statement => executeStatement(statement, tableAndClusterProps)));
 
+  const oldTableNamePrefix = oldResourceProperties.tableName.prefix;
+  if (tableNamePrefix !== oldTableNamePrefix) {
+    await executeStatement(`ALTER TABLE ${tableName} RENAME TO ${tableNamePrefix + tableNameSuffix}`, tableAndClusterProps);
+    return tableNamePrefix + tableNameSuffix;
+  }
+
   return tableName;
 }
 

packages/@aws-cdk/aws-redshift-alpha/lib/table.ts

@@ -236,6 +236,7 @@ export class Table extends TableBase {
   readonly tableColumns: Column[];
   readonly cluster: ICluster;
   readonly databaseName: string;
+  readonly id: string;
 
   private resource: DatabaseQuery<TableHandlerProps>;