support versioned views

memory/database.go

@@ -595,6 +595,13 @@ func (d *Database) GetViewDefinition(ctx *sql.Context, viewName string) (sql.Vie
 	return viewDef, ok, nil
 }
 
+// GetViewDefinitionAsOf implements the interface sql.ViewDatabase.
+func (d *Database) GetViewDefinitionAsOf(ctx *sql.Context, viewName string, asOf interface{}) (sql.ViewDefinition, bool, error) {
+	// TODO: gms in memory db doesn't actually support versioned views
+	viewDef, ok := d.views[strings.ToLower(viewName)]
+	return viewDef, ok, nil
+}
+
 type ReadOnlyDatabase struct {
 	*HistoryDatabase
 }

sql/databases.go

@@ -288,6 +288,14 @@ type EventDatabase interface {
 	NeedsToReloadEvents(ctx *Context, token interface{}) (bool, error)
 }
 
+// VersionedViewDatabase is a Database that can return views as they existed at different points in time.
+type VersionedViewDatabase interface {
+	ViewDatabase
+
+	// GetViewDefinitionAsOf retrieves the ViewDefinition with the name given at the asOf given.
+	GetViewDefinitionAsOf(ctx *Context, viewName string, asOf interface{}) (ViewDefinition, bool, error)
+}
+
 // ViewDatabase is implemented by databases that persist view definitions
 type ViewDatabase interface {
 	// CreateView persists the definition a view with the name and select statement given. If a view with that name

sql/mysql_db/privileged_database_provider.go

@@ -150,6 +150,7 @@ var _ sql.ReadOnlyDatabase = PrivilegedDatabase{}
 var _ sql.TemporaryTableDatabase = PrivilegedDatabase{}
 var _ sql.CollatedDatabase = PrivilegedDatabase{}
 var _ sql.ViewDatabase = PrivilegedDatabase{}
+var _ sql.VersionedViewDatabase = PrivilegedDatabase{}
 var _ fulltext.Database = PrivilegedDatabase{}
 
 // NewPrivilegedDatabase returns a new PrivilegedDatabase.
@@ -395,6 +396,14 @@ func (pdb PrivilegedDatabase) DropView(ctx *sql.Context, name string) error {
 	return sql.ErrViewsNotSupported.New(pdb.db.Name())
 }
 
+// GetViewDefinitionAsOf implements sql.ViewDatabase
+func (pdb PrivilegedDatabase) GetViewDefinitionAsOf(ctx *sql.Context, viewName string, asOf interface{}) (sql.ViewDefinition, bool, error) {
+	if db, ok := pdb.db.(sql.VersionedViewDatabase); ok {
+		return db.GetViewDefinitionAsOf(ctx, viewName, asOf)
+	}
+	return sql.ViewDefinition{}, false, sql.ErrAsOfNotSupported.New(pdb.db.Name())
+}
+
 // GetViewDefinition implements sql.ViewDatabase
 func (pdb PrivilegedDatabase) GetViewDefinition(ctx *sql.Context, viewName string) (sql.ViewDefinition, bool, error) {
 	if db, ok := pdb.db.(sql.ViewDatabase); ok {

sql/planbuilder/from.go

@@ -812,56 +812,74 @@ func resolvedViewScope(outScope *scope, view sql.Node, db string, name string) (
 	return outScope, true
 }
 
+func (b *Builder) resolveViewDef(name string, database sql.Database, viewDef sql.ViewDefinition, asOf interface{}) *sql.View {
+	oldOpts := b.parserOpts
+	defer func() {
+		b.parserOpts = oldOpts
+	}()
+	outerAsOf := b.ViewCtx().AsOf
+	outerDb := b.ViewCtx().DbName
+	b.ViewCtx().AsOf = asOf
+	b.ViewCtx().DbName = database.Name()
+	defer func() {
+		b.ViewCtx().AsOf = outerAsOf
+		b.ViewCtx().DbName = outerDb
+	}()
+	b.parserOpts = sql.NewSqlModeFromString(viewDef.SqlMode).ParserOptions()
+	stmt, _, _, err := b.parser.ParseWithOptions(b.ctx, viewDef.CreateViewStatement, ';', false, b.parserOpts)
+	if err != nil {
+		b.handleErr(err)
+	}
+	node, _, err := b.bindOnlyWithDatabase(database, stmt, viewDef.CreateViewStatement)
+	if err != nil {
+		// TODO: Need to account for non-existing functions or
+		//  users without appropriate privilege to the referenced table/column/function.
+		if sql.ErrTableNotFound.Is(err) || sql.ErrColumnNotFound.Is(err) {
+			// TODO: ALTER VIEW should not return this error
+			err = sql.ErrInvalidRefInView.New(database.Name(), name)
+		}
+		b.handleErr(err)
+	}
+	create, ok := node.(*plan.CreateView)
+	if !ok {
+		err = fmt.Errorf("expected create view statement, found: %T", node)
+		b.handleErr(err)
+	}
+	switch n := create.Child.(type) {
+	case *plan.SubqueryAlias:
+		return n.AsView(viewDef.CreateViewStatement)
+	default:
+		view := plan.NewSubqueryAlias(name, create.Definition.TextDefinition, n).AsView(viewDef.CreateViewStatement)
+		b.qFlags.Set(sql.QFlagRelSubquery)
+		return view
+	}
+}
+
 func (b *Builder) resolveView(name string, database sql.Database, asOf interface{}) sql.Node {
 	var view *sql.View
 
-	if vdb, vok := database.(sql.ViewDatabase); vok {
+	if asOf != nil {
+		vdb, vok := database.(sql.VersionedViewDatabase)
+		if !vok {
+			return nil
+		}
+		viewDef, vdok, err := vdb.GetViewDefinitionAsOf(b.ctx, name, asOf)
+		if err != nil {
+			b.handleErr(err)
+		}
+		if vdok {
+			view = b.resolveViewDef(name, database, viewDef, asOf)
+		}
+	} else if vdb, vok := database.(sql.ViewDatabase); vok {
 		viewDef, vdok, err := vdb.GetViewDefinition(b.ctx, name)
 		if err != nil {
 			b.handleErr(err)
 		}
-		oldOpts := b.parserOpts
-		defer func() {
-			b.parserOpts = oldOpts
-		}()
 		if vdok {
-			outerAsOf := b.ViewCtx().AsOf
-			outerDb := b.ViewCtx().DbName
-			b.ViewCtx().AsOf = asOf
-			b.ViewCtx().DbName = database.Name()
-			defer func() {
-				b.ViewCtx().AsOf = outerAsOf
-				b.ViewCtx().DbName = outerDb
-			}()
-			b.parserOpts = sql.NewSqlModeFromString(viewDef.SqlMode).ParserOptions()
-			stmt, _, _, err := b.parser.ParseWithOptions(b.ctx, viewDef.CreateViewStatement, ';', false, b.parserOpts)
-			if err != nil {
-				b.handleErr(err)
-			}
-			node, _, err := b.bindOnlyWithDatabase(database, stmt, viewDef.CreateViewStatement)
-			if err != nil {
-				// TODO: Need to account for non-existing functions or
-				//  users without appropriate privilege to the referenced table/column/function.
-				if sql.ErrTableNotFound.Is(err) || sql.ErrColumnNotFound.Is(err) {
-					// TODO: ALTER VIEW should not return this error
-					err = sql.ErrInvalidRefInView.New(database.Name(), name)
-				}
-				b.handleErr(err)
-			}
-			create, ok := node.(*plan.CreateView)
-			if !ok {
-				err = fmt.Errorf("expected create view statement, found: %T", node)
-				b.handleErr(err)
-			}
-			switch n := create.Child.(type) {
-			case *plan.SubqueryAlias:
-				view = n.AsView(viewDef.CreateViewStatement)
-			default:
-				view = plan.NewSubqueryAlias(name, create.Definition.TextDefinition, n).AsView(viewDef.CreateViewStatement)
-				b.qFlags.Set(sql.QFlagRelSubquery)
-			}
+			view = b.resolveViewDef(name, database, viewDef, asOf)
 		}
 	}
+
 	// If we didn't find the view from the database directly, use the in-session registry
 	if view == nil {
 		view, _ = b.ctx.GetViewRegistry().View(database.Name(), name)