This is an automated cherry-pick of pingcap#42566

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

infoschema/infoschema.go

@@ -564,3 +564,31 @@ func (ts *TemporaryTableAttachedInfoSchema) SchemaByTable(tableInfo *model.Table
 
  return ts.InfoSchema.SchemaByTable(tableInfo)
 }
+<<<<<<< HEAD
+=======
+
+// UpdateTableInfo implements InfoSchema.SchemaByTable.
+func (ts *SessionExtendedInfoSchema) UpdateTableInfo(db *model.DBInfo, tableInfo table.Table) error {
+ if ts.MdlTables == nil {
+ ts.MdlTables = NewSessionTables()
+ }
+ err := ts.MdlTables.AddTable(db, tableInfo)
+ if err != nil {
+ return err
+ }
+ return nil
+}
+
+// HasTemporaryTable returns whether information schema has temporary table
+func (ts *SessionExtendedInfoSchema) HasTemporaryTable() bool {
+ return ts.LocalTemporaryTables != nil && ts.LocalTemporaryTables.Count() > 0 || ts.InfoSchema.HasTemporaryTable()
+}
+
+// DetachTemporaryTableInfoSchema returns a new SessionExtendedInfoSchema without temporary tables
+func (ts *SessionExtendedInfoSchema) DetachTemporaryTableInfoSchema() *SessionExtendedInfoSchema {
+ return &SessionExtendedInfoSchema{
+ InfoSchema: ts.InfoSchema,
+ MdlTables: ts.MdlTables,
+ }
+}
+>>>>>>> 9e849851061 (infoschema: fix select temporary table with view will panic problem (#42566))

table/temptable/BUILD.bazel

@@ -0,0 +1,64 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+ name = "temptable",
+ srcs = [
+ "ddl.go",
+ "infoschema.go",
+ "interceptor.go",
+ ],
+ importpath = "github.com/pingcap/tidb/table/temptable",
+ visibility = ["//visibility:public"],
+ deps = [
+ "//infoschema",
+ "//kv",
+ "//meta",
+ "//meta/autoid",
+ "//parser/ast",
+ "//parser/model",
+ "//sessionctx",
+ "//sessionctx/variable",
+ "//store/driver/txn",
+ "//table",
+ "//table/tables",
+ "//tablecodec",
+ "@com_github_pingcap_errors//:errors",
+ "@com_github_tikv_client_go_v2//tikv",
+ "@org_golang_x_exp//maps",
+ ],
+)
+
+go_test(
+ name = "temptable_test",
+ timeout = "short",
+ srcs = [
+ "ddl_test.go",
+ "interceptor_test.go",
+ "intergration_test.go",
+ "main_test.go",
+ ],
+ embed = [":temptable"],
+ flaky = True,
+ deps = [
+ "//infoschema",
+ "//kv",
+ "//meta/autoid",
+ "//parser/auth",
+ "//parser/model",
+ "//parser/mysql",
+ "//sessionctx",
+ "//store/driver/txn",
+ "//store/mockstore",
+ "//table",
+ "//tablecodec",
+ "//testkit",
+ "//testkit/testsetup",
+ "//types",
+ "//util/codec",
+ "//util/mock",
+ "@com_github_pingcap_errors//:errors",
+ "@com_github_stretchr_testify//require",
+ "@org_golang_x_exp//slices",
+ "@org_uber_go_goleak//:goleak",
+ ],
+)

table/temptable/infoschema.go

@@ -38,8 +38,13 @@ func AttachLocalTemporaryTableInfoSchema(sctx sessionctx.Context, is infoschema.
 
 // DetachLocalTemporaryTableInfoSchema detach local temporary table information schema from is
 func DetachLocalTemporaryTableInfoSchema(is infoschema.InfoSchema) infoschema.InfoSchema {
+<<<<<<< HEAD
  if attachedInfoSchema, ok := is.(*infoschema.TemporaryTableAttachedInfoSchema); ok {
  return attachedInfoSchema.InfoSchema
+=======
+ if attachedInfoSchema, ok := is.(*infoschema.SessionExtendedInfoSchema); ok {
+ return attachedInfoSchema.DetachTemporaryTableInfoSchema()
+>>>>>>> 9e849851061 (infoschema: fix select temporary table with view will panic problem (#42566))
  }
 
  return is

table/temptable/intergration_test.go

@@ -0,0 +1,39 @@
+// Copyright 2023 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package temptable_test
+
+import (
+ "testing"
+
+ "github.com/pingcap/tidb/parser/auth"
+ "github.com/pingcap/tidb/testkit"
+ "github.com/stretchr/testify/require"
+)
+
+func TestSelectTemporaryTableUnionView(t *testing.T) {
+ // see the issue: https://github.com/pingcap/tidb/issues/42563
+ store := testkit.CreateMockStore(t)
+ tk := testkit.NewTestKit(t, store)
+ require.NoError(t, tk.Session().Auth(&auth.UserIdentity{Username: "root", Hostname: "%"}, nil, nil))
+ tk.MustExec("use test")
+ tk.MustExec("create table t(a int)")
+ tk.MustExec("insert into t values(1)")
+ tk.MustExec("create view tv as select a from t")
+ tk.MustExec("create temporary table t(a int)")
+ tk.MustExec("insert into t values(2)")
+ tk.MustQuery("select * from tv").Check(testkit.Rows("1"))
+ tk.MustQuery("select * from t").Check(testkit.Rows("2"))
+ tk.MustQuery("select * from (select a from t union all select a from tv) t1 order by a").Check(testkit.Rows("1", "2"))
+}