4byte pk

Author: sm745052

v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/MySQLDataTypesIT.java

@@ -392,7 +392,6 @@ private Map<String, List<Map<String, Object>>> getExpectedData() {
             "varbinary_to_string", "7835383030", "fffffffffffffffffffffffffffffffff...", "NULL"));
     expectedData.put(
         "varchar", createRows("varchar", "abc", repeatString("a", 33) + "...", "NULL"));
-    expectedData.put("varchar_utf8mb4", createRows("varchar_utf8mb4", "😊"));
     expectedData.put("year", createRows("year", "2022", "1901", "2155", "NULL"));
     expectedData.put("set", createRows("set", "v1,v2", "NULL"));
     expectedData.put(
@@ -421,6 +420,7 @@ private Map<String, List<Map<String, Object>>> getExpectedData() {
     expectedData.put("tiny_blob_pk", createRows("tiny_blob_pk", "AA==", "gAAAAAAAAAA="));
     expectedData.put("char_pk", createRows("char_pk", "AA==", "gAAAAAAAAAA="));
     expectedData.put("varchar_pk", createRows("varchar_pk", "AA==", "gAAAAAAAAAA="));
+    expectedData.put("varchar_utf8mb4_pk", createRows("varchar_utf8mb4_pk", "😊"));
     expectedData.put("tiny_text_pk", createRows("tiny_text_pk", "AA==", "gAAAAAAAAAA="));
     expectedData.put(
         "date_time_pk",

v2/sourcedb-to-spanner/src/test/resources/DataTypesIT/mysql-data-types.sql

@@ -1,15 +1,11 @@
 SET GLOBAL max_connections = 300;
+SET NAMES utf8mb4;
 
 CREATE TABLE `varchar_table` (
     `id` INT PRIMARY KEY,
     `varchar_col` VARCHAR(21000) CHARACTER SET utf8 DEFAULT NULL
 );
 
-CREATE TABLE `varchar_utf8mb4_table` (
-    `id` INT PRIMARY KEY AUTO_INCREMENT,
-    `varchar_utf8mb4_col` VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL
-);
-
 CREATE TABLE `tinyint_table` (
     `id` INT PRIMARY KEY,
     `tinyint_col` TINYINT DEFAULT NULL
@@ -460,6 +456,11 @@ CREATE TABLE varchar_pk_table (
    varchar_pk_col VARCHAR(20) NOT NULL
 ) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
 
+CREATE TABLE varchar_utf8mb4_pk_table (
+   id VARCHAR(20) PRIMARY KEY,
+   varchar_utf8mb4_pk_col VARCHAR(20) NOT NULL
+) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
 CREATE TABLE tiny_text_pk_table (
    id TINYTEXT,
    tiny_text_pk_col TINYTEXT NOT NULL,
@@ -722,7 +723,6 @@ INSERT INTO `varbinary_to_string_table` (`varbinary_to_string_col`) VALUES (REPE
 INSERT INTO `varchar_table` (`varchar_col`) VALUES ('abc');
 INSERT INTO `varchar_table` (`varchar_col`) VALUES (REPEAT('a', 21000));
 
-INSERT INTO `varchar_utf8mb4_table` (`varchar_utf8mb4_col`) VALUES ('😊');
 INSERT INTO `year_table` (`year_col`) VALUES (2022);
 INSERT INTO `year_table` (`year_col`) VALUES (1901);
 INSERT INTO `year_table` (`year_col`) VALUES (2155);
@@ -744,6 +744,7 @@ INSERT INTO `varbinary_pk_table` (`id`, `varbinary_pk_col`) VALUES (FROM_BASE64(
 INSERT INTO `tiny_blob_pk_table` (`id`, `tiny_blob_pk_col`) VALUES (FROM_BASE64('AA=='), FROM_BASE64('AA==')), (FROM_BASE64('gAAAAAAAAAA='), FROM_BASE64('gAAAAAAAAAA='));
 INSERT INTO `char_pk_table` (`id`, `char_pk_col`) VALUES ('AA==', 'AA=='), ('gAAAAAAAAAA=', 'gAAAAAAAAAA=');
 INSERT INTO `varchar_pk_table` (`id`, `varchar_pk_col`) VALUES ('AA==', 'AA=='), ('gAAAAAAAAAA=', 'gAAAAAAAAAA=');
+INSERT INTO `varchar_utf8mb4_pk_table` (`id`, `varchar_utf8mb4_pk_col`) VALUES ('😊', '😊');
 INSERT INTO `tiny_text_pk_table` (`id`, `tiny_text_pk_col`) VALUES ('AA==', 'AA=='), ('gAAAAAAAAAA=', 'gAAAAAAAAAA=');
 INSERT INTO `date_time_pk_table` (`id`, `date_time_pk_col`) VALUES ('1000-01-01 00:00:00', '1000-01-01 00:00:00'), ('1000-01-01 00:00:01', '1000-01-01 00:00:01'),
                                                                    ('2001-01-01 00:01:54.123456', '2001-01-01 00:01:54.123456'),

v2/sourcedb-to-spanner/src/test/resources/DataTypesIT/mysql-spanner-schema.sql

@@ -366,11 +366,6 @@ CREATE TABLE IF NOT EXISTS varchar_table (
   varchar_col STRING(21000),
 ) PRIMARY KEY(id);
 
-CREATE TABLE IF NOT EXISTS varchar_utf8mb4_table (
-  id INT64 NOT NULL,
-  varchar_utf8mb4_col STRING(255),
-) PRIMARY KEY(id);
-
 CREATE TABLE IF NOT EXISTS year_table (
   id INT64 NOT NULL,
   year_col STRING(MAX),
@@ -502,6 +497,11 @@ CREATE TABLE IF NOT EXISTS varchar_pk_table (
   varchar_pk_col STRING(20) NOT NULL,
 ) PRIMARY KEY(id);
 
+CREATE TABLE IF NOT EXISTS varchar_utf8mb4_pk_table (
+  id STRING(20) NOT NULL,
+  varchar_utf8mb4_pk_col STRING(20) NOT NULL,
+) PRIMARY KEY(id);
+
 CREATE TABLE IF NOT EXISTS tiny_text_pk_table (
   id STRING(20) NOT NULL,
   tiny_text_pk_col STRING(20) NOT NULL,