@@ -114,7 +114,7 @@ func (s MongoClickhouseSuite) Test_Simple_Flow() {
114114 tc := e2e .NewTemporalClient (t )
115115 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
116116
117- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load to match" , srcTable , dstTable , "_id,_full_document " )
117+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load to match" , srcTable , dstTable , "_id,doc " )
118118
119119 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
120120 // insert 10 rows into the source table for cdc
@@ -126,7 +126,7 @@ func (s MongoClickhouseSuite) Test_Simple_Flow() {
126126 require .True (t , res .Acknowledged )
127127 }
128128
129- e2e .EnvWaitForEqualTablesWithNames (env , s , "cdc events to match" , srcTable , dstTable , "_id,_full_document " )
129+ e2e .EnvWaitForEqualTablesWithNames (env , s , "cdc events to match" , srcTable , dstTable , "_id,doc " )
130130 env .Cancel (t .Context ())
131131 e2e .RequireEnvCanceled (t , env )
132132}
@@ -161,7 +161,7 @@ func (s MongoClickhouseSuite) Test_Simple_Flow_Partitioned() {
161161 tc := e2e .NewTemporalClient (t )
162162 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
163163
164- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load to match" , srcTable , dstTable , "_id,_full_document " )
164+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load to match" , srcTable , dstTable , "_id,doc " )
165165
166166 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
167167 // insert 10 rows into the source table for cdc
@@ -173,7 +173,7 @@ func (s MongoClickhouseSuite) Test_Simple_Flow_Partitioned() {
173173 require .True (t , res .Acknowledged )
174174 }
175175
176- e2e .EnvWaitForEqualTablesWithNames (env , s , "cdc events to match" , srcTable , dstTable , "_id,_full_document " )
176+ e2e .EnvWaitForEqualTablesWithNames (env , s , "cdc events to match" , srcTable , dstTable , "_id,doc " )
177177 env .Cancel (t .Context ())
178178 e2e .RequireEnvCanceled (t , env )
179179}
@@ -210,7 +210,7 @@ func (s MongoClickhouseSuite) Test_Inconsistent_Schema() {
210210
211211 tc := e2e .NewTemporalClient (t )
212212 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
213- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load to match" , srcTable , dstTable , "_id,_full_document " )
213+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load to match" , srcTable , dstTable , "_id,doc " )
214214
215215 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
216216
@@ -224,7 +224,7 @@ func (s MongoClickhouseSuite) Test_Inconsistent_Schema() {
224224 require .NoError (t , err )
225225 require .True (t , res .Acknowledged )
226226 }
227- e2e .EnvWaitForEqualTablesWithNames (env , s , "cdc events to match" , srcTable , dstTable , "_id,_full_document " )
227+ e2e .EnvWaitForEqualTablesWithNames (env , s , "cdc events to match" , srcTable , dstTable , "_id,doc " )
228228
229229 env .Cancel (t .Context ())
230230 e2e .RequireEnvCanceled (t , env )
@@ -255,7 +255,7 @@ func (s MongoClickhouseSuite) Test_CDC() {
255255 insertRes , err := collection .InsertOne (t .Context (), bson.D {bson.E {Key : "key" , Value : 1 }}, options .InsertOne ())
256256 require .NoError (t , err )
257257 require .True (t , insertRes .Acknowledged )
258- e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable , dstTable , "_id,_full_document " )
258+ e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable , dstTable , "_id,doc " )
259259
260260 updateRes , err := collection .UpdateOne (
261261 t .Context (),
@@ -264,7 +264,7 @@ func (s MongoClickhouseSuite) Test_CDC() {
264264 options .UpdateOne ())
265265 require .NoError (t , err )
266266 require .Equal (t , int64 (1 ), updateRes .ModifiedCount )
267- e2e .EnvWaitForEqualTablesWithNames (env , s , "update event" , srcTable , dstTable , "_id,_full_document " )
267+ e2e .EnvWaitForEqualTablesWithNames (env , s , "update event" , srcTable , dstTable , "_id,doc " )
268268
269269 replaceRes , err := collection .ReplaceOne (
270270 t .Context (),
@@ -273,12 +273,12 @@ func (s MongoClickhouseSuite) Test_CDC() {
273273 options .Replace ())
274274 require .NoError (t , err )
275275 require .Equal (t , int64 (1 ), replaceRes .ModifiedCount )
276- e2e .EnvWaitForEqualTablesWithNames (env , s , "replace event" , srcTable , dstTable , "_id,_full_document " )
276+ e2e .EnvWaitForEqualTablesWithNames (env , s , "replace event" , srcTable , dstTable , "_id,doc " )
277277
278278 deleteRes , err := collection .DeleteOne (t .Context (), bson.D {bson.E {Key : "key" , Value : 3 }}, options .DeleteOne ())
279279 require .NoError (t , err )
280280 require .Equal (t , int64 (1 ), deleteRes .DeletedCount )
281- e2e .EnvWaitForEqualTablesWithNames (env , s , "delete event" , srcTable , dstTable , "_id,_full_document " )
281+ e2e .EnvWaitForEqualTablesWithNames (env , s , "delete event" , srcTable , dstTable , "_id,doc " )
282282
283283 env .Cancel (t .Context ())
284284 e2e .RequireEnvCanceled (t , env )
@@ -317,35 +317,35 @@ func (s MongoClickhouseSuite) Test_Nested_Document_At_Limit() {
317317
318318 tc := e2e .NewTemporalClient (t )
319319 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
320- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable , dstTable , "_id,_full_document " )
320+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable , dstTable , "_id,doc " )
321321
322322 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
323323
324324 // insert nested doc for cdc
325325 res , err = collection .InsertOne (t .Context (), nestedDoc ("X" ), options .InsertOne ())
326326 require .NoError (t , err )
327327 require .True (t , res .Acknowledged )
328- e2e .EnvWaitForEqualTablesWithNames (env , s , "insert events to match" , srcTable , dstTable , "_id,_full_document " )
328+ e2e .EnvWaitForEqualTablesWithNames (env , s , "insert events to match" , srcTable , dstTable , "_id,doc " )
329329
330330 oid := bson.D {bson.E {Key : "_id" , Value : res .InsertedID }}
331331
332332 // update nested doc for cdc
333333 updateRes , err := collection .UpdateOne (t .Context (), oid , bson.D {bson.E {Key : "$set" , Value : nestedDoc ("Y" )}}, options .UpdateOne ())
334334 require .NoError (t , err )
335335 require .Equal (t , int64 (1 ), updateRes .ModifiedCount )
336- e2e .EnvWaitForEqualTablesWithNames (env , s , "update events to match" , srcTable , dstTable , "_id,_full_document " )
336+ e2e .EnvWaitForEqualTablesWithNames (env , s , "update events to match" , srcTable , dstTable , "_id,doc " )
337337
338338 // replace nested doc for cdc
339339 replaceRes , err := collection .ReplaceOne (t .Context (), oid , nestedDoc ("Z" ), options .Replace ())
340340 require .NoError (t , err )
341341 require .Equal (t , int64 (1 ), replaceRes .ModifiedCount )
342- e2e .EnvWaitForEqualTablesWithNames (env , s , "replace events to match" , srcTable , dstTable , "_id,_full_document " )
342+ e2e .EnvWaitForEqualTablesWithNames (env , s , "replace events to match" , srcTable , dstTable , "_id,doc " )
343343
344344 // delete nested doc for cdc
345345 deleteRes , err := collection .DeleteOne (t .Context (), oid , options .DeleteOne ())
346346 require .NoError (t , err )
347347 require .Equal (t , int64 (1 ), deleteRes .DeletedCount )
348- e2e .EnvWaitForEqualTablesWithNames (env , s , "delete events to match" , srcTable , dstTable , "_id,_full_document " )
348+ e2e .EnvWaitForEqualTablesWithNames (env , s , "delete events to match" , srcTable , dstTable , "_id,doc " )
349349
350350 env .Cancel (t .Context ())
351351 e2e .RequireEnvCanceled (t , env )
@@ -384,35 +384,35 @@ func (s MongoClickhouseSuite) Test_Large_Document_At_Limit() {
384384
385385 tc := e2e .NewTemporalClient (t )
386386 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
387- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable , dstTable , "_id,_full_document " )
387+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable , dstTable , "_id,doc " )
388388
389389 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
390390
391391 // insert large doc for cdc (to test change event with "fullDocument")
392392 res , err = collection .InsertOne (t .Context (), largeDoc ("X" ), options .InsertOne ())
393393 require .NoError (t , err )
394394 require .True (t , res .Acknowledged )
395- e2e .EnvWaitForEqualTablesWithNames (env , s , "insert events to match" , srcTable , dstTable , "_id,_full_document " )
395+ e2e .EnvWaitForEqualTablesWithNames (env , s , "insert events to match" , srcTable , dstTable , "_id,doc " )
396396
397397 oid := bson.D {bson.E {Key : "_id" , Value : res .InsertedID }}
398398
399399 // update large doc for cdc
400400 updateRes , err := collection .UpdateOne (t .Context (), oid , bson.D {bson.E {Key : "$set" , Value : largeDoc ("Y" )}}, options .UpdateOne ())
401401 require .NoError (t , err )
402402 require .Equal (t , int64 (1 ), updateRes .ModifiedCount )
403- e2e .EnvWaitForEqualTablesWithNames (env , s , "update events to match" , srcTable , dstTable , "_id,_full_document " )
403+ e2e .EnvWaitForEqualTablesWithNames (env , s , "update events to match" , srcTable , dstTable , "_id,doc " )
404404
405405 // replace large doc for cdc
406406 replaceRes , err := collection .ReplaceOne (t .Context (), oid , largeDoc ("Z" ), options .Replace ())
407407 require .NoError (t , err )
408408 require .Equal (t , int64 (1 ), replaceRes .ModifiedCount )
409- e2e .EnvWaitForEqualTablesWithNames (env , s , "replace events to match" , srcTable , dstTable , "_id,_full_document " )
409+ e2e .EnvWaitForEqualTablesWithNames (env , s , "replace events to match" , srcTable , dstTable , "_id,doc " )
410410
411411 // delete large doc for cdc
412412 deleteRes , err := collection .DeleteOne (t .Context (), oid , options .DeleteOne ())
413413 require .NoError (t , err )
414414 require .Equal (t , int64 (1 ), deleteRes .DeletedCount )
415- e2e .EnvWaitForEqualTablesWithNames (env , s , "delete events to match" , srcTable , dstTable , "_id,_full_document " )
415+ e2e .EnvWaitForEqualTablesWithNames (env , s , "delete events to match" , srcTable , dstTable , "_id,doc " )
416416
417417 env .Cancel (t .Context ())
418418 e2e .RequireEnvCanceled (t , env )
@@ -457,8 +457,8 @@ func (s MongoClickhouseSuite) Test_Transactions_Across_Collections() {
457457
458458 tc := e2e .NewTemporalClient (t )
459459 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
460- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable1 , dstTable1 , "_id,_full_document " )
461- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable2 , dstTable2 , "_id,_full_document " )
460+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable1 , dstTable1 , "_id,doc " )
461+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable2 , dstTable2 , "_id,doc " )
462462
463463 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
464464
@@ -480,8 +480,8 @@ func (s MongoClickhouseSuite) Test_Transactions_Across_Collections() {
480480 require .NoError (t , err )
481481 require .Equal (t , int64 (1 ), res .([]* mongo.UpdateResult )[0 ].ModifiedCount )
482482 require .Equal (t , int64 (1 ), res .([]* mongo.UpdateResult )[1 ].ModifiedCount )
483- e2e .EnvWaitForEqualTablesWithNames (env , s , "t1 to match" , srcTable1 , dstTable1 , "_id,_full_document " )
484- e2e .EnvWaitForEqualTablesWithNames (env , s , "t2 to match" , srcTable2 , dstTable2 , "_id,_full_document " )
483+ e2e .EnvWaitForEqualTablesWithNames (env , s , "t1 to match" , srcTable1 , dstTable1 , "_id,doc " )
484+ e2e .EnvWaitForEqualTablesWithNames (env , s , "t2 to match" , srcTable2 , dstTable2 , "_id,doc " )
485485
486486 env .Cancel (t .Context ())
487487 e2e .RequireEnvCanceled (t , env )
@@ -511,25 +511,25 @@ func (s MongoClickhouseSuite) Test_Enable_Json() {
511511
512512 tc := e2e .NewTemporalClient (t )
513513 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
514- e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable , dstTable , "_id,_full_document " )
514+ e2e .EnvWaitForEqualTablesWithNames (env , s , "initial load" , srcTable , dstTable , "_id,doc " )
515515
516516 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
517517
518518 insertRes , err := collection .InsertOne (t .Context (), bson.D {bson.E {Key : "key2" , Value : "val2" }}, options .InsertOne ())
519519 require .NoError (t , err )
520520 require .True (t , insertRes .Acknowledged )
521- e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable , dstTable , "_id,_full_document " )
521+ e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable , dstTable , "_id,doc " )
522522 oid := bson.D {bson.E {Key : "_id" , Value : res .InsertedID }}
523523
524524 replaceRes , err := collection .ReplaceOne (t .Context (), oid , bson.D {bson.E {Key : "key2" , Value : "val2" }}, options .Replace ())
525525 require .NoError (t , err )
526526 require .Equal (t , int64 (1 ), replaceRes .ModifiedCount )
527- e2e .EnvWaitForEqualTablesWithNames (env , s , "replace event" , srcTable , dstTable , "_id,_full_document " )
527+ e2e .EnvWaitForEqualTablesWithNames (env , s , "replace event" , srcTable , dstTable , "_id,doc " )
528528
529529 deleteRes , err := collection .DeleteOne (t .Context (), oid , options .DeleteOne ())
530530 require .NoError (t , err )
531531 require .Equal (t , int64 (1 ), deleteRes .DeletedCount )
532- e2e .EnvWaitForEqualTablesWithNames (env , s , "delete event" , srcTable , dstTable , "_id,_full_document " )
532+ e2e .EnvWaitForEqualTablesWithNames (env , s , "delete event" , srcTable , dstTable , "_id,doc " )
533533
534534 env .Cancel (t .Context ())
535535 e2e .RequireEnvCanceled (t , env )
@@ -566,8 +566,8 @@ func (s MongoClickhouseSuite) Test_Mongo_Can_Resume_After_Delete_Table() {
566566 insertRes , err = db .Collection (srcTable2 ).InsertOne (t .Context (), bson.D {bson.E {Key : "key" , Value : "val" }}, options .InsertOne ())
567567 require .NoError (t , err )
568568 require .True (t , insertRes .Acknowledged )
569- e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable1 , dstTable1 , "_id,_full_document " )
570- e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable2 , dstTable2 , "_id,_full_document " )
569+ e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable1 , dstTable1 , "_id,doc " )
570+ e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable2 , dstTable2 , "_id,doc " )
571571
572572 // pause workflow
573573 e2e .SignalWorkflow (t .Context (), env , model .FlowSignal , model .PauseSignal )
@@ -590,7 +590,7 @@ func (s MongoClickhouseSuite) Test_Mongo_Can_Resume_After_Delete_Table() {
590590 insertRes , err = db .Collection (srcTable1 ).InsertOne (t .Context (), bson.D {bson.E {Key : "key2" , Value : "val2" }}, options .InsertOne ())
591591 require .NoError (t , err )
592592 require .True (t , insertRes .Acknowledged )
593- e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable1 , dstTable1 , "_id,_full_document " )
593+ e2e .EnvWaitForEqualTablesWithNames (env , s , "insert event" , srcTable1 , dstTable1 , "_id,doc " )
594594
595595 env .Cancel (t .Context ())
596596 e2e .RequireEnvCanceled (t , env )
@@ -724,16 +724,16 @@ func (s MongoClickhouseSuite) Test_Json_Types() {
724724
725725 tc := e2e .NewTemporalClient (t )
726726 env := e2e .ExecutePeerflow (t , tc , flowConnConfig )
727- e2e .EnvWaitForCount (env , s , "initial load" , dstTable , "_id,_full_document " , 1 )
727+ e2e .EnvWaitForCount (env , s , "initial load" , dstTable , "_id,doc " , 1 )
728728
729729 e2e .SetupCDCFlowStatusQuery (t , env , flowConnConfig )
730730
731731 insertRes , err = collection .InsertOne (t .Context (), doc , options .InsertOne ())
732732 require .NoError (t , err )
733733 require .True (t , insertRes .Acknowledged )
734- e2e .EnvWaitForCount (env , s , "cdc" , dstTable , "_id,_full_document " , 2 )
734+ e2e .EnvWaitForCount (env , s , "cdc" , dstTable , "_id,doc " , 2 )
735735
736- rows , err := s .GetRows (dstTable , "_id,_full_document " )
736+ rows , err := s .GetRows (dstTable , "_id,doc " )
737737 require .NoError (t , err )
738738 require .Len (t , rows .Records , 2 , "Expected 2 rows in destination table" )
739739
0 commit comments