From 6e1ff6244d516b2a17229450a4205f005d938e01 Mon Sep 17 00:00:00 2001 From: Wraith2 Date: Sun, 15 Jun 2025 23:48:15 +0100 Subject: [PATCH 1/4] change TryReadString to use TryReadBytesWithContinue --- .../src/Microsoft/Data/SqlClient/TdsParser.cs | 44 +----------- .../src/Microsoft/Data/SqlClient/TdsParser.cs | 44 +----------- .../Data/SqlClient/TdsParserStateObject.cs | 52 +++++++++++--- .../SQL/DataReaderTest/DataReaderTest.cs | 70 +++++++++++++++++++ 4 files changed, 115 insertions(+), 95 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs index 5320d1e51f..7eaee4e150 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs @@ -6374,7 +6374,7 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value, } else { - result = TryReadByteArrayWithContinue(stateObj, length, out b); + result = stateObj.TryReadByteArrayWithContinue(length, out b); if (result != TdsOperationStatus.Done) { return result; @@ -6495,48 +6495,6 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value, return TdsOperationStatus.Done; } - private TdsOperationStatus TryReadByteArrayWithContinue(TdsParserStateObject stateObj, int length, out byte[] bytes) - { - bytes = null; - int offset = 0; - byte[] temp = null; - (bool canContinue, bool isStarting, bool isContinuing) = stateObj.GetSnapshotStatuses(); - if (canContinue) - { - if (isContinuing || isStarting) - { - temp = stateObj.TryTakeSnapshotStorage() as byte[]; - Debug.Assert(bytes == null || bytes.Length == length, "stored buffer length must be null or must have been created with the correct length"); - } - if (temp != null) - { - offset = stateObj.GetSnapshotTotalSize(); - } - } - - - if (temp == null) - { - temp = new byte[length]; - } - - TdsOperationStatus result = stateObj.TryReadByteArray(temp, length, out _, offset, isStarting || isContinuing); - - if (result == TdsOperationStatus.Done) - { - bytes = temp; - } - else if (result == TdsOperationStatus.NeedMoreData) - { - if (isStarting || isContinuing) - { - stateObj.SetSnapshotStorage(temp); - } - } - - return result; - } - private TdsOperationStatus TryReadSqlDateTime(SqlBuffer value, byte tdsType, int length, byte scale, TdsParserStateObject stateObj) { Span datetimeBuffer = ((uint)length <= 16) ? stackalloc byte[16] : new byte[length]; diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs index 46f5748dc9..08b5bfc625 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs @@ -6570,7 +6570,7 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value, } else { - result = TryReadByteArrayWithContinue(stateObj, length, out b); + result = stateObj.TryReadByteArrayWithContinue(length, out b); if (result != TdsOperationStatus.Done) { return result; @@ -6691,48 +6691,6 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value, return TdsOperationStatus.Done; } - private TdsOperationStatus TryReadByteArrayWithContinue(TdsParserStateObject stateObj, int length, out byte[] bytes) - { - bytes = null; - int offset = 0; - byte[] temp = null; - (bool canContinue, bool isStarting, bool isContinuing) = stateObj.GetSnapshotStatuses(); - if (canContinue) - { - if (isContinuing || isStarting) - { - temp = stateObj.TryTakeSnapshotStorage() as byte[]; - Debug.Assert(bytes == null || bytes.Length == length, "stored buffer length must be null or must have been created with the correct length"); - } - if (temp != null) - { - offset = stateObj.GetSnapshotTotalSize(); - } - } - - - if (temp == null) - { - temp = new byte[length]; - } - - TdsOperationStatus result = stateObj.TryReadByteArray(temp, length, out _, offset, isStarting || isContinuing); - - if (result == TdsOperationStatus.Done) - { - bytes = temp; - } - else if (result == TdsOperationStatus.NeedMoreData) - { - if (isStarting || isContinuing) - { - stateObj.SetSnapshotStorage(temp); - } - } - - return result; - } - private TdsOperationStatus TryReadSqlDateTime(SqlBuffer value, byte tdsType, int length, byte scale, TdsParserStateObject stateObj) { Span datetimeBuffer = ((uint)length <= 16) ? stackalloc byte[16] : new byte[length]; diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs index ea3e4a9ce6..a1b820bb0d 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs @@ -1497,6 +1497,48 @@ public TdsOperationStatus TryReadByteArray(Span buff, int len, out int tot return TdsOperationStatus.Done; } + public TdsOperationStatus TryReadByteArrayWithContinue(int length, out byte[] bytes) + { + bytes = null; + int offset = 0; + byte[] temp = null; + (bool canContinue, bool isStarting, bool isContinuing) = GetSnapshotStatuses(); + if (canContinue) + { + if (isContinuing || isStarting) + { + temp = TryTakeSnapshotStorage() as byte[]; + Debug.Assert(bytes == null || bytes.Length == length, "stored buffer length must be null or must have been created with the correct length"); + } + if (temp != null) + { + offset = GetSnapshotTotalSize(); + } + } + + + if (temp == null) + { + temp = new byte[length]; + } + + TdsOperationStatus result = TryReadByteArray(temp, length, out _, offset, isStarting || isContinuing); + + if (result == TdsOperationStatus.Done) + { + bytes = temp; + } + else if (result == TdsOperationStatus.NeedMoreData) + { + if (isStarting || isContinuing) + { + SetSnapshotStorage(temp); + } + } + + return result; + } + // Takes no arguments and returns a byte from the buffer. If the buffer is empty, it is filled // before the byte is returned. internal TdsOperationStatus TryReadByte(out byte value) @@ -1843,21 +1885,13 @@ internal TdsOperationStatus TryReadString(int length, out string value) if (((_inBytesUsed + cBytes) > _inBytesRead) || (_inBytesPacket < cBytes)) { - if (_bTmp == null || _bTmp.Length < cBytes) - { - _bTmp = new byte[cBytes]; - } - - TdsOperationStatus result = TryReadByteArray(_bTmp, cBytes); + TdsOperationStatus result = TryReadByteArrayWithContinue(cBytes, out buf); if (result != TdsOperationStatus.Done) { value = null; return result; } - // assign local to point to parser scratch buffer - buf = _bTmp; - AssertValidState(); } else diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs index 4e56acf2c5..1b56d845c2 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs @@ -790,6 +790,76 @@ static char[] Resize(char[] buffer) } } + [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] + public static async Task CanReadLargeNTextColumn() + { + string stringValue = "
m:66
m:213
m:4860
m:4836
m:20
m:151
m:152
m:153
m:154
m:147
m:148
m:149
m:150
m:335
m:4873
m:454
m:173
m:432
m:5900
m:431
m:5899
m:434
m:433
m:428
m:5896
m:427
m:5895
m:5119
m:999806003
m:199
m:312
m:4612
m:5100
m:320
m:4620
m:4841
m:310
m:4610
m:67
m:324
m:4624
m:4863
m:315
m:4615
m:4861
m:4862

m:99980224

m:99980223

m:99980220

m:99980222

m:99980221
m:4835

m:99980226

m:99980227
m:9102
m:9103
m:9117
m:9118
m:119
m:125
m:38
m:46
m:54
m:160
m:114
m:40
m:48
m:56
m:162
m:116
m:36
m:44
m:52
m:158
m:112
m:34
m:42
m:50
m:214
m:156
m:110
m:999804006
m:999804007
m:102
m:9132
m:9133
m:277
m:4124
m:3
m:4
m:5
m:19
m:25
m:26
m:27
m:285
m:287
m:289
m:4360
m:4362
m:4364
m:217
m:85
m:5372
m:5371
m:6657
m:6665
m:6658
m:6666
m:6659
m:6667
m:6660
m:6668
m:202
m:196
m:198
m:197
m:311
m:4611
m:321
m:4621
m:316
m:4616
m:317
m:4617
m:319
m:4619
m:322
m:4622
m:323
m:4623
m:318
m:4618
m:326
m:309
m:4609
m:68
m:4859
m:4853
m:314
m:4614
m:4850
m:4851
m:4852
m:4858
m:4847
m:4848
m:4849
m:4844
m:4843
m:4842
m:4845
m:4846
m:4855
m:4856
m:4854
m:4857

m:99980219

m:99980225

m:99980228
m:6661
m:6669
m:6662
m:6670
m:6663
m:6671
m:6664
m:6672
m:131
m:97
m:37
m:45
m:53
m:159
m:113
m:144
m:39
m:47
m:55
m:161
m:115
m:35
m:43
m:51
m:157
m:111
m:33
m:41
m:49
m:155
m:109
m:132
m:130
m:6141
m:999807019
m:424
m:5892
m:9178
m:9179
m:9180
m:9181
m:9182
m:9183
m:9184
m:9185
m:9186
m:9187
m:9188
m:9189
m:9190
m:9191
m:9192
m:9193
m:430
m:5898
m:429
m:5897
m:9137
m:444
m:445
m:5120
m:6400
m:5376
m:5632
m:4096
m:6144
m:4864
m:5888
m:6656
m:4352
m:4608
m:106
m:11
m:5374
m:5375
m:292
m:4367
m:9085
m:9086
m:5115
m:5116
m:5113
m:5114
m:5117
m:5112
m:5111
m:9143
m:9144
m:6138
m:129
m:411
m:412
m:4865
m:4866
m:327
m:328
m:999803093
m:5102
m:341
m:4879
m:5108
m:334
m:4872
m:5092
m:5091
m:349
m:4887
m:348
m:4886
m:346
m:4884
m:347
m:4885
m:407
m:356
m:4894
m:5101
m:383
m:4922
m:395
m:4919
m:16
m:5095
m:5094
m:5093
m:343
m:4881
m:342
m:4880
m:83
m:345
m:4883
m:84
m:4923
m:384
m:999803088
m:120
m:405
m:999803089
m:332
m:4870
m:387
m:4926
m:5103
m:381
m:379
m:4920
m:4917
m:5097
m:999803099
m:999803100
m:999803101
m:999803102
m:999803103
m:99
m:31
m:344
m:4882
m:181
m:330
m:4868
m:182
m:79
m:81
m:340
m:4878
m:339
m:4877
m:357
m:4895
m:358
m:4896
m:5107
m:354
m:4892
m:351
m:4889
m:350
m:4888
m:353
m:4891
m:352
m:4890
m:999803135
m:999803136
m:999803141
m:999803142
m:999803140
m:999803138
m:999803139
m:999803137
m:999803091
m:999803092
m:999803090
m:409
m:410
m:408
m:999803146
m:999803147
m:98
m:4874
m:336
m:5096
m:338
m:337
m:4876
m:4875
m:378
m:4916
m:390
m:4929
m:392
m:4931
m:393
m:4932
m:404
m:359
m:4897
m:4898
m:360
m:401
m:402
m:403
m:376
m:4914
m:999803108
m:999803109
m:999803110
m:999803111
m:4927
m:388
m:331
m:4869
m:355
m:4893
m:333
m:4871
m:400
m:4938
m:375
m:4913
m:4935
m:397
m:999803113
m:999803114
m:999803115
m:999803116
m:30
m:5106
m:5105
m:999803112
m:4925
m:4924
m:999803149
m:999803148
m:386
m:385
m:123
m:999803087
m:999803104
m:999803105
m:999803106
m:999803107
m:398
m:4936
m:399
m:4937
m:999803145
m:100
m:382
m:4921
m:380
m:4918
m:108
m:423
m:5891
m:422
m:5890
m:122
m:421
m:9145
m:5889
m:5369
m:18
m:9141
m:9142
m:103
m:15
m:174
m:175
m:176
m:451
m:452
m:453
m:448
m:449
m:450
m:13
m:9122
m:9123
m:394
m:4933
m:9130
m:9196
m:9129
m:9195
m:9128
m:9194
m:9131
m:9197
m:21
m:180
m:170
m:203
m:128
m:101
m:413
m:5121
m:414
m:5122
m:4351
m:9126
m:9125
m:9124
m:999803094
m:999803095
m:999803096
m:999803097
m:999803098
m:127

m:99980137

m:99980138
m:126
m:308
m:9101

m:99980132
m:4383
m:185
m:183
m:184
m:188
m:186
m:187
m:191
m:189
m:190
m:194
m:192
m:193
m:89
m:86
m:90
m:87
m:91
m:88
m:420
m:5634
m:107
m:14
m:134
m:133
m:28
m:12
m:290
m:291
m:5368
m:65
m:104
m:70
m:9067
m:9068
m:274
m:4122
m:275
m:4121
m:141
m:96
m:258
m:4105
m:259
m:4106
m:999803150
m:999803143
m:391
m:4930
m:179
m:72
m:6143
m:6142

m:99980133

m:99980134
m:169
m:204
m:206
m:208
m:216
m:284
m:9078
m:9077
m:286
m:9080
m:9079
m:288
m:9082
m:9081
m:4359
m:4361
m:4363
m:4603
m:4602
m:4605
m:4604
m:4607
m:4606
m:293
m:4368
m:211
m:212
m:205
m:207
m:209
m:4587
m:257
m:4104
m:29
m:295
m:4370
m:4348
m:4349
m:4347
m:4343
m:4345
m:4346
m:4344
m:5099
m:4840
m:9114
m:9109
m:9120
m:9110
m:9112
m:9115
m:9116
m:9111
m:9119
m:4838
m:4837
m:140
m:138
m:146
m:143
m:139
m:4839
m:142
m:145
m:325
m:4625
m:9104
m:9105
m:9107
m:9108
m:105
m:10
m:95
m:0
m:1
m:2
m:92
m:93
m:94
m:999803122
m:999803117
m:999803123
m:999803124
m:999803121
m:999803118
m:999803119
m:999803134
m:999803128
m:999803129
m:999803130
m:999803126
m:999803127
m:999803125
m:999803131
m:999803132
m:999803133
m:4903
m:365
m:366
m:4904
m:4909
m:371
m:369
m:4907
m:406
m:363
m:4901
m:368
m:4906
m:367
m:4905
m:370
m:4908
m:364
m:4902
m:361
m:4899
m:372
m:4910
m:373
m:4911
m:374
m:4912
m:124
m:362
m:4900
m:999803144
m:396
m:4934
m:75
m:999806004
m:6140
m:6139
m:6120
m:118
m:78
m:9121
m:6121
m:6128
m:6130
m:6131
m:6132
m:6129
m:6126
m:6124
m:6125
m:9159
m:6123
m:6122
m:6133
m:166
m:167
m:168
m:17
m:5109
m:5118
m:5110
m:171
m:172
m:6404
m:9049
m:9164
m:9047
m:9162
m:9048
m:9163
m:9055
m:9056
m:9057
m:9058
m:9059
m:9060
m:9174
m:9172
m:9173
m:9113

m:99980229
m:313
m:4613
m:9106
m:71
m:419
m:5633
m:121
m:219
m:218
m:221
m:220
m:223
m:222
m:4599
m:4598
m:260
m:4107
m:9053
m:261
m:4108
m:9054
m:4593
m:4592
m:4591
m:4590
m:4589
m:4588
m:4595
m:4594
m:4597
m:4596
m:4350
m:256
m:4103
m:4601
m:4600
m:9087
m:9088
m:294
m:4369
m:6145
m:6146
m:276
m:4123
m:74
m:73
m:9052
m:9167
m:9050
m:9165
m:9051
m:9166
m:163
m:164
m:165
m:9061
m:9062
m:9063
m:9064
m:9065
m:9066
m:9069
m:9070
m:9041
m:9042
m:9043
m:9044
m:9045
m:9046
m:6119
m:22
m:23
m:24
m:4365
m:9083
m:4366
m:9084

m:99980135
m:417
m:5377
m:200
m:69
m:9160
m:9161
m:4586
m:4585
m:6402
m:6403
m:999803120
m:6137
m:201
m:215
m:9156
m:9155
m:9152
m:9151
m:9158
m:9148
m:9154
m:9153
m:9147
m:9146
m:9157
m:178
m:177
m:6134
m:9150
m:9149
m:6135
m:6136
m:210
m:76
m:77
m:82
m:5098
m:6127
m:32
m:5370
m:9138
m:9140
m:9139
m:5373
m:80
m:438
m:437
m:436
m:435
m:6401
m:6406
m:6405
m:9177
m:9175
m:9176
m:1000
m:1001
m:64

m:99980136
m:195
m:117
m:999804005
m:416
m:5124
m:415
m:5123
m:9170
m:9168
m:9169
m:9171
m:6407
m:6408
m:329
m:4867
m:4928
m:389
m:9127
m:5104
m:418
m:5378
m:251
m:9089
m:9090
m:296
m:297
m:262
m:263
m:9071
m:9072
m:9095
m:9096
m:302
m:303
m:268
m:269
m:250
m:278
m:279
m:253
m:9091
m:9092
m:298
m:299
m:264
m:265
m:9073
m:9074
m:9097
m:9098
m:304
m:305
m:270
m:271
m:252
m:280
m:281
m:255
m:9093
m:9094
m:300
m:301
m:266
m:267
m:9075
m:9076
m:9099
m:9100
m:306
m:307
m:272
m:273
m:254
m:282
m:283
m:4098
m:4371
m:4372
m:4109
m:4110
m:4377
m:4378
m:4115
m:4116
m:4097
m:4353
m:4354
m:4100
m:4373
m:4374
m:4111
m:4112
m:4379
m:4380
m:4117
m:4118
m:4099
m:4355
m:4356
m:4102
m:4375
m:4376
m:4113
m:4114
m:4381
m:4382
m:4119
m:4120
m:4101
m:4357
m:4358
m:377
m:4915
m:9199
m:9198
m:426
m:5894
m:425
m:5893
m:137
m:135
m:136
m:9135
m:9134
m:9136
d:7
d:4
d:1
d:8
d:9
d:2
d:5
d:3
d:6
dp:2
dp:36
dp:29
dp:17
dp:8
dp:30
dp:7
dp:3
dp:28
dp:32
dp:10
dp:27
dp:33
dp:21
dp:13
dp:26
dp:38
dp:18
dp:24
dp:9
dp:31
dp:16
dp:11
dp:19
dp:22
dp:23
dp:20
dp:34
dp:35
dp:6
dp:37
dp:5
dp:15
dp:25
dp:4
dp:1
dp:12
dp:14
i:26
i:164
i:221
i:222
i:14
i:181
i:4
i:10
i:16
i:151
i:17
i:149
i:94
i:93
i:225
i:218
i:216
i:264
i:265
i:259
i:185
i:91
i:92
i:21
i:278
i:70
i:71
i:56
i:55
i:282
i:202
i:206
i:74
i:50
i:83
i:82
i:81
i:289
i:34
i:272
i:217
i:247
i:246
i:161
i:88
i:207
i:208
i:43
i:66
i:253
i:254
i:11
i:12
i:90
i:53
i:38
i:281
i:179
i:189
i:226
i:201
i:24
i:25
i:153
i:1
i:96
i:95
i:131
i:133
i:132
i:195
i:258
i:30
i:77
i:35
i:27
i:49
i:39
i:263
i:45
i:46
i:44
i:285
i:284
i:142
i:145
i:152
i:166
i:165
i:158
i:163
i:144
i:143
i:273
i:274
i:275
i:242
i:103
i:172
i:171
i:271
i:100
i:101
i:98
i:99
i:87
i:128
i:110
i:109
i:106
i:123
i:127
i:112
i:108
i:111
i:116
i:115
i:129
i:107
i:119
i:113
i:114
i:117
i:120
i:118
i:121
i:122
i:126
i:124
i:125
i:75
i:268
i:269
i:159
i:266
i:270
i:168
i:13
i:150
i:167
i:257
i:219
i:60
i:59
i:137
i:138
i:227
i:9
i:243
i:65
i:223
i:224
i:68
i:64
i:160
i:203
i:80
i:197
i:182
i:28
i:79
i:85
i:267
i:51
i:73
i:78
i:84
i:89
i:134
i:173
i:104
i:7
i:22
i:52
i:146
i:194
i:36
i:40
i:162
i:245
i:199
i:69
i:67
i:154
i:176
i:220
i:233
i:156
i:193
i:86
i:198
i:277
i:209
i:210
i:232
i:215
i:62
i:32
i:170
i:157
i:252
i:54
i:41
i:155
i:279
i:169
i:147
i:148
i:37
i:29
i:178
i:177
i:213
i:33
i:283
i:175
i:58
i:20
i:63
i:15
i:3
i:200
i:2
i:261
i:286
i:135
i:136
i:276
i:47
i:8
i:97
i:288
i:139
i:287
i:190
i:192
i:191
i:18
i:76
i:130
i:204
i:260
i:231
i:214
i:61
i:141
i:280
i:228
i:229
i:234
i:235
i:250
i:251
i:186
i:188
i:187
i:230
i:42
i:196
i:240
i:239
i:140
i:23
i:241
i:174
i:72
i:205
i:256
i:255
i:19
i:48
i:6
i:102
i:211
i:212
i:57
i:262
i:244
i:236
i:237
i:238
i:5
i:105
i:248
i:249
i:183
i:184
i:31
i:180
t:3
t:11
t:10
t:21
t:4
t:6
t:9
t:7
t:8
t:13
t:18
t:12
t:19
t:17
t:5
t:15
t:1
t:20
t:2
t:16
t:14"; + + using (var cn = new Microsoft.Data.SqlClient.SqlConnection(DataTestUtility.TCPConnectionString)) + { + await cn.OpenAsync(); + + using (var cmd = cn.CreateCommand()) + { + cmd.CommandText = $""" + if exists (select * + from sysobjects + where name = 'Expl_User_Global_Sets_' + and xtype = 'U') + + begin + drop table dbo.Expl_User_Global_Sets_ + end + + create table dbo.Expl_User_Global_Sets_ + ( + User_ID varchar(22) not null, + StringName varchar(255) not null, + IsGlobal bit not null, + List ntext, + UseProtoSerializer bit, + ModuleNameForUse tinyint, + IsReadOnly bit not null, + VersionNumber smallint not null, + UserGlobalSet_ID uniqueidentifier not null, + IsProtoCorrected bit default 1 + ) + + insert into dbo.Expl_User_Global_Sets_(User_ID, StringName, IsGlobal, List, UseProtoSerializer, ModuleNameForUse, + IsReadOnly, VersionNumber, UserGlobalSet_ID, IsProtoCorrected) + values ('80004Q4WZ1350KO8NT59RM', '_', 1, '{stringValue}', 1, 2, 1, 1, newid(), 1); + + """; + + await cmd.ExecuteNonQueryAsync(); + + cmd.CommandText = $"""" + SELECT + --[gs].[UserGlobalSet_ID], + --[gs].[User_ID], + --[gs].[StringName], + --[gs].[IsGlobal], + [gs].[List], + [gs].[UseProtoSerializer]--, + --[gs].[ModuleNameForUse], + --[gs].[IsReadOnly], + --[gs].[VersionNumber], + --[gs].[IsProtoCorrected] + FROM + [dbo].[Expl_User_Global_Sets_] [gs] + WHERE + ([gs].[IsGlobal] = 1 OR [gs].[User_ID] = '{"80004Q4WZ1350KO8NT59RM"}') AND + ([gs].[ModuleNameForUse] IS NULL OR [gs].[ModuleNameForUse] = {2}) + + """"; + + var l = (string)await cmd.ExecuteScalarAsync(); + Assert.Equal(stringValue, l); + + } + } + } + // Synapse: Cannot find data type 'rowversion'. [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void CheckLegacyNullRowVersionIsEmptyArray() From 7325828d8b7587554133df5a7a3a5eac11150f48 Mon Sep 17 00:00:00 2001 From: Wraith2 Date: Mon, 16 Jun 2025 21:31:36 +0100 Subject: [PATCH 2/4] review feedback --- .../SQL/DataReaderTest/DataReaderTest.cs | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs index 1b56d845c2..1f7cad5ed0 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs @@ -799,9 +799,13 @@ public static async Task CanReadLargeNTextColumn() { await cn.OpenAsync(); - using (var cmd = cn.CreateCommand()) + string tableName = DataTestUtility.GenerateObjectName(); + + try { - cmd.CommandText = $""" + using (var cmd = cn.CreateCommand()) + { + cmd.CommandText = $""" if exists (select * from sysobjects where name = 'Expl_User_Global_Sets_' @@ -811,7 +815,7 @@ from sysobjects drop table dbo.Expl_User_Global_Sets_ end - create table dbo.Expl_User_Global_Sets_ + create table {tableName} ( User_ID varchar(22) not null, StringName varchar(255) not null, @@ -825,15 +829,15 @@ StringName varchar(255) not null, IsProtoCorrected bit default 1 ) - insert into dbo.Expl_User_Global_Sets_(User_ID, StringName, IsGlobal, List, UseProtoSerializer, ModuleNameForUse, + insert into {tableName}(User_ID, StringName, IsGlobal, List, UseProtoSerializer, ModuleNameForUse, IsReadOnly, VersionNumber, UserGlobalSet_ID, IsProtoCorrected) values ('80004Q4WZ1350KO8NT59RM', '_', 1, '{stringValue}', 1, 2, 1, 1, newid(), 1); """; - await cmd.ExecuteNonQueryAsync(); + await cmd.ExecuteNonQueryAsync(); - cmd.CommandText = $"""" + cmd.CommandText = $"""" SELECT --[gs].[UserGlobalSet_ID], --[gs].[User_ID], @@ -846,16 +850,31 @@ insert into dbo.Expl_User_Global_Sets_(User_ID, StringName, IsGlobal, List, UseP --[gs].[VersionNumber], --[gs].[IsProtoCorrected] FROM - [dbo].[Expl_User_Global_Sets_] [gs] + {tableName} [gs] WHERE ([gs].[IsGlobal] = 1 OR [gs].[User_ID] = '{"80004Q4WZ1350KO8NT59RM"}') AND ([gs].[ModuleNameForUse] IS NULL OR [gs].[ModuleNameForUse] = {2}) """"; - var l = (string)await cmd.ExecuteScalarAsync(); - Assert.Equal(stringValue, l); + var l = (string)await cmd.ExecuteScalarAsync(); + Assert.Equal(stringValue, l); + } + } + finally + { + try + { + using (var dropCommand = cn.CreateCommand()) + { + dropCommand.CommandText = $"DROP TABLE IF EXISTS [{tableName}]"; + dropCommand.ExecuteNonQuery(); + } + } + catch + { + } } } } From 6f6645742354e70f794bf0c5139bb0c4a54483c9 Mon Sep 17 00:00:00 2001 From: Wraith2 Date: Sat, 21 Jun 2025 11:09:40 +0100 Subject: [PATCH 3/4] tidy up sql --- .../SQL/DataReaderTest/DataReaderTest.cs | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs index 1f7cad5ed0..5651ea25ca 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs @@ -806,16 +806,7 @@ public static async Task CanReadLargeNTextColumn() using (var cmd = cn.CreateCommand()) { cmd.CommandText = $""" - if exists (select * - from sysobjects - where name = 'Expl_User_Global_Sets_' - and xtype = 'U') - - begin - drop table dbo.Expl_User_Global_Sets_ - end - - create table {tableName} + create table [{tableName}] ( User_ID varchar(22) not null, StringName varchar(255) not null, @@ -829,7 +820,7 @@ StringName varchar(255) not null, IsProtoCorrected bit default 1 ) - insert into {tableName}(User_ID, StringName, IsGlobal, List, UseProtoSerializer, ModuleNameForUse, + insert into [{tableName}](User_ID, StringName, IsGlobal, List, UseProtoSerializer, ModuleNameForUse, IsReadOnly, VersionNumber, UserGlobalSet_ID, IsProtoCorrected) values ('80004Q4WZ1350KO8NT59RM', '_', 1, '{stringValue}', 1, 2, 1, 1, newid(), 1); @@ -839,18 +830,10 @@ StringName varchar(255) not null, cmd.CommandText = $"""" SELECT - --[gs].[UserGlobalSet_ID], - --[gs].[User_ID], - --[gs].[StringName], - --[gs].[IsGlobal], [gs].[List], - [gs].[UseProtoSerializer]--, - --[gs].[ModuleNameForUse], - --[gs].[IsReadOnly], - --[gs].[VersionNumber], - --[gs].[IsProtoCorrected] + [gs].[UseProtoSerializer], FROM - {tableName} [gs] + [{tableName}] [gs] WHERE ([gs].[IsGlobal] = 1 OR [gs].[User_ID] = '{"80004Q4WZ1350KO8NT59RM"}') AND ([gs].[ModuleNameForUse] IS NULL OR [gs].[ModuleNameForUse] = {2}) From a8862a9b72c53ceddbc09c3efc49298fcfe57c26 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com> Date: Mon, 23 Jun 2025 12:30:42 -0700 Subject: [PATCH 4/4] Update src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs --- .../tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs index 5651ea25ca..0d024170b6 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs @@ -831,7 +831,7 @@ StringName varchar(255) not null, cmd.CommandText = $"""" SELECT [gs].[List], - [gs].[UseProtoSerializer], + [gs].[UseProtoSerializer] FROM [{tableName}] [gs] WHERE