From 75c72020fe84746599239e811605bcc119e47c24 Mon Sep 17 00:00:00 2001 From: Mohamed Hamza Date: Mon, 3 Mar 2025 13:40:12 -0500 Subject: [PATCH] remove unnecessary conflicts --- go/test/endtoend/vreplication/config_test.go | 26 -------------------- 1 file changed, 26 deletions(-) diff --git a/go/test/endtoend/vreplication/config_test.go b/go/test/endtoend/vreplication/config_test.go index d970c0a27a4..62f20f36e80 100644 --- a/go/test/endtoend/vreplication/config_test.go +++ b/go/test/endtoend/vreplication/config_test.go @@ -399,32 +399,6 @@ create table nopk (name varchar(128), age int unsigned); "create_ddl": "create table cproduct(pid bigint, description varchar(128), date1 datetime not null default '0000-00-00 00:00:00', date2 datetime not null default '2021-00-01 00:00:00', primary key(pid)) CHARSET=utf8mb4" }] } -` - - materializeCustomerNameSpec = ` -{ - "workflow": "customer_name", - "source_keyspace": "customer", - "target_keyspace": "customer", - "table_settings": [{ - "target_table": "customer_name", - "source_expression": "select cid, name from customer", - "create_ddl": "create table if not exists customer_name (cid bigint not null, name varchar(128), primary key(cid), key(name))" - }] -} -` - - materializeCustomerTypeSpec = ` -{ - "workflow": "enterprise_customer", - "source_keyspace": "customer", - "target_keyspace": "customer", - "table_settings": [{ - "target_table": "enterprise_customer", - "source_expression": "select cid, name, typ from customer where typ = 'enterprise'", - "create_ddl": "create table if not exists enterprise_customer (cid bigint not null, name varchar(128), typ varchar(64), primary key(cid), key(typ))" - }] -} ` merchantOrdersVSchema = `