Revert "Mat views indexdes" (#238)

This reverts commit ba0e9dc.

Author: bplunkett-stripe

pkg/diff/materialized_view_sql_generator_test.go

@@ -225,24 +225,15 @@ func buildSchemaDiff(old, new schema.Schema) (schemaDiff, bool, error) {
 	if err != nil {
 		return schemaDiff{}, false, fmt.Errorf("diffing tables: %w", err)
 	}
+
 	newSchemaTablesByName := buildSchemaObjByNameMap(new.Tables)
 	addedTablesByName := buildSchemaObjByNameMap(tableDiffs.adds)
 	deletedTablesByName := buildSchemaObjByNameMap(tableDiffs.deletes)
 	tableDiffsByName := buildDiffByNameMap[schema.Table, tableDiff](tableDiffs.alters)
-
-	materializedViewDiffs, err := diffLists(old.MaterializedViews, new.MaterializedViews, func(old, new schema.MaterializedView, _, _ int) (diff materializedViewDiff, requiresRecreation bool, error error) {
-		return buildMaterializedViewDiff(deletedTablesByName, tableDiffsByName, old, new)
-	})
-	if err != nil {
-		return schemaDiff{}, false, fmt.Errorf("diffing materialized views: %w", err)
-	}
-	addedMatViewsByName := buildSchemaObjByNameMap(materializedViewDiffs.adds)
-
 	indexesDiff, err := diffLists(old.Indexes, new.Indexes, func(oldIndex, newIndex schema.Index, _, _ int) (indexDiff, bool, error) {
 		return buildIndexDiff(indexDiffConfig{
 			newSchemaTablesByName:  newSchemaTablesByName,
 			addedTablesByName:      addedTablesByName,
-			addedMatViewsByName:    addedMatViewsByName,
 			oldSchemaIndexesByName: buildSchemaObjByNameMap(old.Indexes),
 			newSchemaIndexesByName: buildSchemaObjByNameMap(new.Indexes),
 		}, oldIndex, newIndex)
@@ -328,6 +319,13 @@ func buildSchemaDiff(old, new schema.Schema) (schemaDiff, bool, error) {
 		return schemaDiff{}, false, fmt.Errorf("diffing views: %w", err)
 	}
 
+	materializedViewDiffs, err := diffLists(old.MaterializedViews, new.MaterializedViews, func(old, new schema.MaterializedView, _, _ int) (diff materializedViewDiff, requiresRecreation bool, error error) {
+		return buildMaterializedViewDiff(deletedTablesByName, tableDiffsByName, old, new)
+	})
+	if err != nil {
+		return schemaDiff{}, false, fmt.Errorf("diffing materialized views: %w", err)
+	}
+
 	return schemaDiff{
 		oldAndNew: oldAndNew[schema.Schema]{
 			old: old,
@@ -432,7 +430,6 @@ func buildTableDiff(oldTable, newTable schema.Table, _, _ int) (diff tableDiff,
 type indexDiffConfig struct {
 	newSchemaTablesByName map[string]schema.Table
 	addedTablesByName     map[string]schema.Table
-	addedMatViewsByName   map[string]schema.MaterializedView
 
 	// oldSchemaIndexesByName and newSchemaIndexesByName by name are hackaround because the diff function does not yet support hierarchies
 	oldSchemaIndexesByName map[string]schema.Index
@@ -459,10 +456,6 @@ func buildIndexDiff(deps indexDiffConfig, old, new schema.Index) (diff indexDiff
 		// re-created). In other words, an index must be re-created if the owning table is re-created
 		return indexDiff{}, true, nil
 	}
-	if _, isOnNewMatView := deps.addedMatViewsByName[new.OwningTable.GetName()]; isOnNewMatView {
-		// If the materialized view is new, then the index must be re-created
-		return indexDiff{}, true, nil
-	}
 
 	if old.ParentIdx == nil {
 		// If the old index didn't belong to a partitioned index (and the new index does), we can resolve the parent
@@ -538,8 +531,6 @@ func (s schemaSQLGenerator) Alter(diff schemaDiff) ([]Statement, error) {
 	tablesInNewSchemaByName := buildSchemaObjByNameMap(diff.new.Tables)
 	deletedTablesByName := buildSchemaObjByNameMap(diff.tableDiffs.deletes)
 	addedTablesByName := buildSchemaObjByNameMap(diff.tableDiffs.adds)
-	deletedMatViewsByName := buildSchemaObjByNameMap(diff.materializedViewDiffs.deletes)
-	addedMatViewsByName := buildSchemaObjByNameMap(diff.materializedViewDiffs.adds)
 	functionsInNewSchemaByName := buildSchemaObjByNameMap(diff.new.Functions)
 
 	namedSchemaStatements, err := diff.namedSchemaDiffs.resolveToSQLGroupedByEffect(&namedSchemaSQLGenerator{})
@@ -585,13 +576,9 @@ func (s schemaSQLGenerator) Alter(diff schemaDiff) ([]Statement, error) {
 	partialGraph = concatPartialGraphs(partialGraph, renameConflictingIndexesPartialGraph)
 
 	indexGenerator := legacyToNewSqlVertexGenerator[schema.Index, indexDiff](&indexSQLVertexGenerator{
-		deletedTablesByName:     deletedTablesByName,
-		addedTablesByName:       addedTablesByName,
-		tablesInNewSchemaByName: tablesInNewSchemaByName,
-
-		deletedMatViewsByName: deletedMatViewsByName,
-		addedMatViewsByName:   addedMatViewsByName,
-
+		deletedTablesByName:      deletedTablesByName,
+		addedTablesByName:        addedTablesByName,
+		tablesInNewSchemaByName:  tablesInNewSchemaByName,
 		indexesInNewSchemaByName: buildSchemaObjByNameMap(diff.new.Indexes),
 
 		renameSQLVertexGenerator:          renameConflictingIndexesGenerator,
@@ -1580,12 +1567,6 @@ type indexSQLVertexGenerator struct {
 	// tablesInNewSchemaByName is a map of table name to tables (and partitions) in the new schema.
 	// These tables are not necessarily new. This is used to identify if the table is partitioned
 	tablesInNewSchemaByName map[string]schema.Table
-
-	// deletedMatViewsByName is a map of materialized view name to the delete materialized view
-	deletedMatViewsByName map[string]schema.MaterializedView
-	// addedMatViewsByName is a map of materialiezd view name to added materialized view.
-	addedMatViewsByName map[string]schema.MaterializedView
-
 	// indexesInNewSchemaByName is a map of index name to the index
 	// This is used to identify the parent index is a primary key
 	indexesInNewSchemaByName map[string]schema.Index
@@ -1605,9 +1586,6 @@ func (isg *indexSQLVertexGenerator) Add(index schema.Index) ([]Statement, error)
 	if _, isNewTable := isg.addedTablesByName[index.OwningTable.GetName()]; isNewTable {
 		stmts = stripMigrationHazards(stmts...)
 	}
-	if _, isNewMatView := isg.addedMatViewsByName[index.OwningTable.GetName()]; isNewMatView {
-		stmts = stripMigrationHazards(stmts...)
-	}
 	return stmts, nil
 }
 
@@ -1678,12 +1656,9 @@ func (isg *indexSQLVertexGenerator) addIdxStmtsWithHazards(index schema.Index) (
 }
 
 func (isg *indexSQLVertexGenerator) Delete(index schema.Index) ([]Statement, error) {
-	if _, tableWasDeleted := isg.deletedTablesByName[index.OwningTable.GetName()]; tableWasDeleted {
-		// An index will be dropped if its owning table is dropped.
-		return nil, nil
-	}
-	if _, matViewWasDeleted := isg.deletedMatViewsByName[index.OwningTable.GetName()]; matViewWasDeleted {
-		// An index will be dropped if its owning materialized view is dropped.
+	_, tableWasDeleted := isg.deletedTablesByName[index.OwningTable.GetName()]
+	// An index will be dropped if its owning table is dropped.
+	if tableWasDeleted {
 		return nil, nil
 	}
 
@@ -1857,11 +1832,7 @@ func (isg *indexSQLVertexGenerator) GetAddAlterDependencies(index, _ schema.Inde
 
 func (isg *indexSQLVertexGenerator) GetDeleteDependencies(index schema.Index) ([]dependency, error) {
 	dependencies := []dependency{
-		// Technically, only the table -or- materialized view will exist, but there is no harm in having a dependency
-		// on both.
 		mustRun(isg.GetSQLVertexId(index, diffTypeDelete)).after(buildTableVertexId(index.OwningTable, diffTypeDelete)),
-		mustRun(isg.GetSQLVertexId(index, diffTypeDelete)).after(buildMaterializedViewVertexId(index.OwningTable, diffTypeDelete)),
-
 		// Drop the index after it has been potentially renamed
 		mustRun(isg.GetSQLVertexId(index, diffTypeDelete)).after(buildRenameConflictingIndexVertexId(index.GetSchemaQualifiedName(), diffTypeAddAlter)),
 	}
@@ -1879,20 +1850,12 @@ func (isg *indexSQLVertexGenerator) GetDeleteDependencies(index schema.Index) ([
 
 func (isg *indexSQLVertexGenerator) addDepsOnTableAddAlterIfNecessary(index schema.Index) []dependency {
 	// This could be cleaner if start sorting columns separately in the graph
-	// TODO(bplunkett) - can below just be switched to deleted tables by name
 	parentTable, ok := isg.tablesInNewSchemaByName[index.OwningTable.GetName()]
 	if !ok {
 		// If the parent table is deleted, we don't need to worry about making the index statement come
 		// before any alters
 		return nil
 	}
-	if _, deletedMatView := isg.deletedMatViewsByName[index.OwningTable.GetName()]; deletedMatView {
-		// If the parent materialized view is deleted, we don't need to worry about making the index statement come
-		// before any alters.
-		return nil
-	}
-
-	// TODO(bplunkett) - add conditinoal switches for materialized views
 
 	// These dependencies will force the index deletion statement to come before the table AddAlter
 	addAlterColumnDeps := []dependency{