Skip to content

Commit ba6af6d

Browse files
committed
sql: remove nullable from column definition
The nullable element was added in 23.1; there have been enough releases since the column field's deprecation it can be removed entirely. Epic: none Release note: None
1 parent bf25721 commit ba6af6d

File tree

38 files changed

+214
-362
lines changed

38 files changed

+214
-362
lines changed

pkg/ccl/schemachangerccl/testdata/decomp/multiregion

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ ElementState:
233233
in231OrLater: true
234234
in243OrLater: true
235235
familyId: 0
236-
isNullable: true
237236
isVirtual: false
238237
tableId: 110
239238
type:
@@ -263,7 +262,6 @@ ElementState:
263262
in231OrLater: true
264263
in243OrLater: true
265264
familyId: 0
266-
isNullable: false
267265
isVirtual: false
268266
tableId: 110
269267
type:
@@ -293,7 +291,6 @@ ElementState:
293291
in231OrLater: true
294292
in243OrLater: true
295293
familyId: 0
296-
isNullable: true
297294
isVirtual: false
298295
tableId: 110
299296
type:
@@ -323,7 +320,6 @@ ElementState:
323320
in231OrLater: true
324321
in243OrLater: true
325322
familyId: 0
326-
isNullable: true
327323
isVirtual: false
328324
tableId: 110
329325
type:
@@ -353,7 +349,6 @@ ElementState:
353349
in231OrLater: true
354350
in243OrLater: true
355351
familyId: 0
356-
isNullable: true
357352
isVirtual: false
358353
tableId: 110
359354
type:
@@ -383,7 +378,6 @@ ElementState:
383378
in231OrLater: true
384379
in243OrLater: true
385380
familyId: 0
386-
isNullable: true
387381
isVirtual: false
388382
tableId: 110
389383
type:
@@ -633,7 +627,6 @@ ElementState:
633627
in231OrLater: true
634628
in243OrLater: true
635629
familyId: 0
636-
isNullable: true
637630
isVirtual: false
638631
tableId: 109
639632
type:
@@ -663,7 +656,6 @@ ElementState:
663656
in231OrLater: true
664657
in243OrLater: true
665658
familyId: 0
666-
isNullable: false
667659
isVirtual: false
668660
tableId: 109
669661
type:
@@ -693,7 +685,6 @@ ElementState:
693685
in231OrLater: true
694686
in243OrLater: true
695687
familyId: 0
696-
isNullable: true
697688
isVirtual: false
698689
tableId: 109
699690
type:
@@ -723,7 +714,6 @@ ElementState:
723714
in231OrLater: true
724715
in243OrLater: true
725716
familyId: 0
726-
isNullable: true
727717
isVirtual: false
728718
tableId: 109
729719
type:
@@ -753,7 +743,6 @@ ElementState:
753743
in231OrLater: true
754744
in243OrLater: true
755745
familyId: 0
756-
isNullable: true
757746
isVirtual: false
758747
tableId: 109
759748
type:
@@ -783,7 +772,6 @@ ElementState:
783772
in231OrLater: true
784773
in243OrLater: true
785774
familyId: 0
786-
isNullable: true
787775
isVirtual: false
788776
tableId: 109
789777
type:
@@ -1089,7 +1077,6 @@ ElementState:
10891077
in231OrLater: true
10901078
in243OrLater: true
10911079
familyId: 0
1092-
isNullable: false
10931080
isVirtual: false
10941081
tableId: 108
10951082
type:
@@ -1120,7 +1107,6 @@ ElementState:
11201107
in231OrLater: true
11211108
in243OrLater: true
11221109
familyId: 0
1123-
isNullable: false
11241110
isVirtual: false
11251111
tableId: 108
11261112
type:
@@ -1150,7 +1136,6 @@ ElementState:
11501136
in231OrLater: true
11511137
in243OrLater: true
11521138
familyId: 0
1153-
isNullable: true
11541139
isVirtual: false
11551140
tableId: 108
11561141
type:
@@ -1180,7 +1165,6 @@ ElementState:
11801165
in231OrLater: true
11811166
in243OrLater: true
11821167
familyId: 0
1183-
isNullable: true
11841168
isVirtual: false
11851169
tableId: 108
11861170
type:
@@ -1210,7 +1194,6 @@ ElementState:
12101194
in231OrLater: true
12111195
in243OrLater: true
12121196
familyId: 0
1213-
isNullable: true
12141197
isVirtual: false
12151198
tableId: 108
12161199
type:
@@ -1240,7 +1223,6 @@ ElementState:
12401223
in231OrLater: true
12411224
in243OrLater: true
12421225
familyId: 0
1243-
isNullable: true
12441226
isVirtual: false
12451227
tableId: 108
12461228
type:
@@ -1270,7 +1252,6 @@ ElementState:
12701252
in231OrLater: true
12711253
in243OrLater: true
12721254
familyId: 0
1273-
isNullable: true
12741255
isVirtual: false
12751256
tableId: 108
12761257
type:

pkg/ccl/schemachangerccl/testdata/decomp/partitioning

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ ElementState:
164164
in231OrLater: true
165165
in243OrLater: true
166166
familyId: 0
167-
isNullable: false
168167
isVirtual: false
169168
tableId: 104
170169
type:
@@ -194,7 +193,6 @@ ElementState:
194193
in231OrLater: true
195194
in243OrLater: true
196195
familyId: 0
197-
isNullable: false
198196
isVirtual: false
199197
tableId: 104
200198
type:
@@ -224,7 +222,6 @@ ElementState:
224222
in231OrLater: true
225223
in243OrLater: true
226224
familyId: 0
227-
isNullable: true
228225
isVirtual: false
229226
tableId: 104
230227
type:
@@ -254,7 +251,6 @@ ElementState:
254251
in231OrLater: true
255252
in243OrLater: true
256253
familyId: 0
257-
isNullable: true
258254
isVirtual: false
259255
tableId: 104
260256
type:
@@ -284,7 +280,6 @@ ElementState:
284280
in231OrLater: true
285281
in243OrLater: true
286282
familyId: 0
287-
isNullable: true
288283
isVirtual: false
289284
tableId: 104
290285
type:
@@ -314,7 +309,6 @@ ElementState:
314309
in231OrLater: true
315310
in243OrLater: true
316311
familyId: 0
317-
isNullable: true
318312
isVirtual: false
319313
tableId: 104
320314
type:
@@ -344,7 +338,6 @@ ElementState:
344338
in231OrLater: true
345339
in243OrLater: true
346340
familyId: 0
347-
isNullable: true
348341
isVirtual: false
349342
tableId: 104
350343
type:
@@ -676,7 +669,6 @@ ElementState:
676669
in231OrLater: true
677670
in243OrLater: true
678671
familyId: 0
679-
isNullable: false
680672
isVirtual: false
681673
tableId: 105
682674
type:
@@ -706,7 +698,6 @@ ElementState:
706698
in231OrLater: true
707699
in243OrLater: true
708700
familyId: 0
709-
isNullable: true
710701
isVirtual: false
711702
tableId: 105
712703
type:
@@ -736,7 +727,6 @@ ElementState:
736727
in231OrLater: true
737728
in243OrLater: true
738729
familyId: 0
739-
isNullable: true
740730
isVirtual: false
741731
tableId: 105
742732
type:
@@ -766,7 +756,6 @@ ElementState:
766756
in231OrLater: true
767757
in243OrLater: true
768758
familyId: 0
769-
isNullable: true
770759
isVirtual: false
771760
tableId: 105
772761
type:
@@ -796,7 +785,6 @@ ElementState:
796785
in231OrLater: true
797786
in243OrLater: true
798787
familyId: 0
799-
isNullable: true
800788
isVirtual: false
801789
tableId: 105
802790
type:
@@ -826,7 +814,6 @@ ElementState:
826814
in231OrLater: true
827815
in243OrLater: true
828816
familyId: 0
829-
isNullable: true
830817
isVirtual: false
831818
tableId: 105
832819
type:

pkg/ccl/schemachangerccl/testdata/end_to_end/add_column_multiple_regional_by_row/add_column_multiple_regional_by_row.explain

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ Schema change plan for ALTER TABLE ‹multiregion_db›.‹public›.‹table_re
5757
│ ├── SetTableSchemaLocked {"TableID":108}
5858
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":5,"TableID":108}}
5959
│ ├── SetColumnName {"ColumnID":5,"Name":"j","TableID":108}
60-
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"IsNullable":true,"TableID":108}}
60+
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"TableID":108}}
6161
│ ├── AddColumnDefaultExpression {"Default":{"ColumnID":5,"TableID":108}}
6262
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":6,"TableID":108}}
6363
│ ├── SetColumnName {"ColumnID":6,"Name":"l","TableID":108}
64-
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":6,"IsNullable":true,"TableID":108}}
64+
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":6,"TableID":108}}
6565
│ ├── AddColumnDefaultExpression {"Default":{"ColumnID":6,"TableID":108}}
6666
│ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":6,"IndexID":6,"IsUnique":true,"SourceIndexID":1,"TableID":108,"TemporaryIndexID":7}}
6767
│ ├── AddIndexPartitionInfo {"Partitioning":{"IndexID":6,"TableID":108}}
@@ -180,11 +180,11 @@ Schema change plan for ALTER TABLE ‹multiregion_db›.‹public›.‹table_re
180180
│ ├── SetTableSchemaLocked {"TableID":108}
181181
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":5,"TableID":108}}
182182
│ ├── SetColumnName {"ColumnID":5,"Name":"j","TableID":108}
183-
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"IsNullable":true,"TableID":108}}
183+
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"TableID":108}}
184184
│ ├── AddColumnDefaultExpression {"Default":{"ColumnID":5,"TableID":108}}
185185
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":6,"TableID":108}}
186186
│ ├── SetColumnName {"ColumnID":6,"Name":"l","TableID":108}
187-
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":6,"IsNullable":true,"TableID":108}}
187+
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":6,"TableID":108}}
188188
│ ├── AddColumnDefaultExpression {"Default":{"ColumnID":6,"TableID":108}}
189189
│ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":6,"IndexID":6,"IsUnique":true,"SourceIndexID":1,"TableID":108,"TemporaryIndexID":7}}
190190
│ ├── MaybeAddSplitForIndex {"IndexID":6,"TableID":108}

pkg/ccl/schemachangerccl/testdata/end_to_end/alter_table_alter_primary_key_rbr/alter_table_alter_primary_key_rbr.explain

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Schema change plan for ALTER TABLE ‹multiregion_db›.‹public›.‹table_re
5252
│ ├── SetTableSchemaLocked {"TableID":108}
5353
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":5,"TableID":108}}
5454
│ ├── SetColumnName {"ColumnID":5,"Name":"m","TableID":108}
55-
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"IsNullable":true,"TableID":108}}
55+
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"TableID":108}}
5656
│ ├── AddColumnDefaultExpression {"Default":{"ColumnID":5,"TableID":108}}
5757
│ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":7,"IndexID":8,"IsUnique":true,"SourceIndexID":1,"TableID":108,"TemporaryIndexID":9}}
5858
│ ├── AddIndexPartitionInfo {"Partitioning":{"IndexID":8,"TableID":108}}
@@ -161,7 +161,7 @@ Schema change plan for ALTER TABLE ‹multiregion_db›.‹public›.‹table_re
161161
│ ├── SetTableSchemaLocked {"TableID":108}
162162
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":5,"TableID":108}}
163163
│ ├── SetColumnName {"ColumnID":5,"Name":"m","TableID":108}
164-
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"IsNullable":true,"TableID":108}}
164+
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":5,"TableID":108}}
165165
│ ├── AddColumnDefaultExpression {"Default":{"ColumnID":5,"TableID":108}}
166166
│ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":7,"IndexID":8,"IsUnique":true,"SourceIndexID":1,"TableID":108,"TemporaryIndexID":9}}
167167
│ ├── MaybeAddSplitForIndex {"IndexID":8,"TableID":108}

0 commit comments

Comments
 (0)