From 9e6468d56e593b76ec0e810d284aed27d087db64 Mon Sep 17 00:00:00 2001
From: Rohan Yadav <rohany@alumni.cmu.edu>
Date: Wed, 12 Aug 2020 16:28:12 -0400
Subject: [PATCH] importccl: disable import with user defined schemas

Release note (enterprise change): Cannot use `IMPORT` to create tables
in user defined schemas. Users should instead create the table with
`CREATE TABLE` and then use `IMPORT INTO`.
---
 pkg/ccl/importccl/import_stmt.go      |  8 ++++++++
 pkg/ccl/importccl/import_stmt_test.go | 16 ++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkg/ccl/importccl/import_stmt.go b/pkg/ccl/importccl/import_stmt.go
index d90f91ae8799..098dfbc66cf3 100644
--- a/pkg/ccl/importccl/import_stmt.go
+++ b/pkg/ccl/importccl/import_stmt.go
@@ -719,6 +719,14 @@ func importPlanHook(
 				}
 			}
 
+			// Due to how we generate and rewrite descriptor ID's for import, we run
+			// into problems when using user defined schemas.
+			if parentSchemaID != keys.PublicSchemaID {
+				err := errors.New("cannot use IMPORT with a user defined schema")
+				hint := errors.WithHint(err, "create the table with CREATE TABLE and use IMPORT INTO instead")
+				return hint
+			}
+
 			tableDetails = make([]jobspb.ImportDetails_Table, len(tableDescs))
 			for i := range tableDescs {
 				tableDetails[i] = jobspb.ImportDetails_Table{
diff --git a/pkg/ccl/importccl/import_stmt_test.go b/pkg/ccl/importccl/import_stmt_test.go
index 34b63012d2cf..becd153f897f 100644
--- a/pkg/ccl/importccl/import_stmt_test.go
+++ b/pkg/ccl/importccl/import_stmt_test.go
@@ -1869,15 +1869,9 @@ IMPORT TABLE import_with_db_privs (a INT8 PRIMARY KEY, b STRING) CSV DATA (%s)`,
 		sqlDB.Exec(t, `USE uds`)
 		sqlDB.Exec(t, `CREATE SCHEMA sc`)
 		// Now import into a table under sc.
-		sqlDB.Exec(t, fmt.Sprintf(`IMPORT TABLE uds.sc.t (a INT8 PRIMARY KEY, b STRING) CSV DATA (%s)`, testFiles.files[0]))
-		// Verify that the table was created and has the right number of rows.
-		var result int
-		sqlDB.QueryRow(t, `SELECT count(*) FROM uds.sc.t`).Scan(&result)
-		require.Equal(t, rowsPerFile, result)
-		// Try the same thing, but with IMPORT INTO.
-		sqlDB.Exec(t, `DROP TABLE uds.sc.t`)
 		sqlDB.Exec(t, `CREATE TABLE uds.sc.t (a INT8 PRIMARY KEY, b STRING)`)
 		sqlDB.Exec(t, fmt.Sprintf(`IMPORT INTO uds.sc.t (a, b) CSV DATA (%s)`, testFiles.files[0]))
+		var result int
 		sqlDB.QueryRow(t, `SELECT count(*) FROM uds.sc.t`).Scan(&result)
 		require.Equal(t, rowsPerFile, result)
 	})
@@ -4843,15 +4837,9 @@ func TestImportAvro(t *testing.T) {
 	t.Run("user-defined-schemas", func(t *testing.T) {
 		sqlDB.Exec(t, `SET experimental_enable_user_defined_schemas = true`)
 		sqlDB.Exec(t, `CREATE SCHEMA myschema`)
-		// Test with normal IMPORT.
-		sqlDB.Exec(t, `IMPORT TABLE myschema.simple (i INT8 PRIMARY KEY, s text, b bytea) AVRO DATA ($1)`, simpleOcf)
-		var numRows int
-		sqlDB.QueryRow(t, `SELECT count(*) FROM myschema.simple`).Scan(&numRows)
-		require.True(t, numRows > 0)
-		// Test with IMPORT INTO.
-		sqlDB.Exec(t, `DROP TABLE myschema.simple`)
 		sqlDB.Exec(t, `CREATE TABLE myschema.simple (i INT8 PRIMARY KEY, s text, b bytea)`)
 		sqlDB.Exec(t, `IMPORT INTO myschema.simple (i, s, b) AVRO DATA ($1)`, simpleOcf)
+		var numRows int
 		sqlDB.QueryRow(t, `SELECT count(*) FROM myschema.simple`).Scan(&numRows)
 		require.True(t, numRows > 0)
 	})