Skip to content

Commit 2c9adab

Browse files
DrewKimballDrewKimball
committed
sql: turn routine dep settings on by default
This commit flips the two new session settings for fixing+improving routine column dependency tracking to on by default. Epic: None Release note: None
1 parent a5e9fbe commit 2c9adab

File tree

7 files changed

+12
-28
lines changed

7 files changed

+12
-28
lines changed

‎pkg/ccl/logictestccl/testdata/logic_test/triggers‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5125,9 +5125,6 @@ subtest end
51255125
# mutation that involves a trigger.
51265126
subtest regression_158154
51275127

5128-
statement ok
5129-
SET use_improved_routine_deps_triggers_and_computed_cols = true;
5130-
51315128
statement ok
51325129
CREATE TABLE xy_158154 (x INT, y INT);
51335130

@@ -5177,9 +5174,6 @@ DROP PROCEDURE p
51775174
statement ok
51785175
DROP TABLE xy_158154
51795176

5180-
statement ok
5181-
RESET use_improved_routine_deps_triggers_and_computed_cols;
5182-
51835177
subtest end
51845178

51855179
# ==============================================================================

‎pkg/sql/logictest/testdata/logic_test/information_schema‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4234,7 +4234,7 @@ plan_cache_mode auto
42344234
plpgsql_use_strict_into off
42354235
prefer_lookup_joins_for_fks off
42364236
prepared_statements_cache_size 0 B
4237-
prevent_update_set_column_drop off
4237+
prevent_update_set_column_drop on
42384238
propagate_admission_header_to_leaf_transactions on
42394239
propagate_input_ordering off
42404240
recursion_depth_limit 1000
@@ -4285,7 +4285,7 @@ unconstrained_non_covering_index_scan_enabled off
42854285
unsafe_allow_triggers_modifying_cascades off
42864286
use_cputs_on_non_unique_indexes off
42874287
use_improved_routine_dependency_tracking on
4288-
use_improved_routine_deps_triggers_and_computed_cols off
4288+
use_improved_routine_deps_triggers_and_computed_cols on
42894289
use_pre_25_2_variadic_builtins off
42904290
use_proc_txn_control_extended_protocol_fix on
42914291
use_soft_limit_for_distribute_scan on

‎pkg/sql/logictest/testdata/logic_test/pg_catalog‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3188,7 +3188,7 @@ plan_cache_mode auto
31883188
plpgsql_use_strict_into off NULL NULL NULL string
31893189
prefer_lookup_joins_for_fks off NULL NULL NULL string
31903190
prepared_statements_cache_size 0 B NULL NULL NULL string
3191-
prevent_update_set_column_drop off NULL NULL NULL string
3191+
prevent_update_set_column_drop on NULL NULL NULL string
31923192
propagate_admission_header_to_leaf_transactions on NULL NULL NULL string
31933193
propagate_input_ordering off NULL NULL NULL string
31943194
recursion_depth_limit 1000 NULL NULL NULL string
@@ -3241,7 +3241,7 @@ unsafe_allow_triggers_modifying_cascades off
32413241
use_cputs_on_non_unique_indexes off NULL NULL NULL string
32423242
use_declarative_schema_changer on NULL NULL NULL string
32433243
use_improved_routine_dependency_tracking on NULL NULL NULL string
3244-
use_improved_routine_deps_triggers_and_computed_cols off NULL NULL NULL string
3244+
use_improved_routine_deps_triggers_and_computed_cols on NULL NULL NULL string
32453245
use_pre_25_2_variadic_builtins off NULL NULL NULL string
32463246
use_proc_txn_control_extended_protocol_fix on NULL NULL NULL string
32473247
use_soft_limit_for_distribute_scan on NULL NULL NULL string
@@ -3440,7 +3440,7 @@ plan_cache_mode auto
34403440
plpgsql_use_strict_into off NULL user NULL off off
34413441
prefer_lookup_joins_for_fks off NULL user NULL off off
34423442
prepared_statements_cache_size 0 B B user NULL 0 B 0 B
3443-
prevent_update_set_column_drop off NULL user NULL off off
3443+
prevent_update_set_column_drop on NULL user NULL on on
34443444
propagate_admission_header_to_leaf_transactions on NULL user NULL on on
34453445
propagate_input_ordering off NULL user NULL off off
34463446
recursion_depth_limit 1000 NULL user NULL 1000 1000
@@ -3493,7 +3493,7 @@ unsafe_allow_triggers_modifying_cascades off
34933493
use_cputs_on_non_unique_indexes off NULL user NULL off off
34943494
use_declarative_schema_changer on NULL user NULL on on
34953495
use_improved_routine_dependency_tracking on NULL user NULL on on
3496-
use_improved_routine_deps_triggers_and_computed_cols off NULL user NULL off off
3496+
use_improved_routine_deps_triggers_and_computed_cols on NULL user NULL on on
34973497
use_pre_25_2_variadic_builtins off NULL user NULL off off
34983498
use_proc_txn_control_extended_protocol_fix on NULL user NULL on on
34993499
use_soft_limit_for_distribute_scan on NULL user NULL on on

‎pkg/sql/logictest/testdata/logic_test/show_source‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ plan_cache_mode auto
205205
plpgsql_use_strict_into off
206206
prefer_lookup_joins_for_fks off
207207
prepared_statements_cache_size 0 B
208-
prevent_update_set_column_drop off
208+
prevent_update_set_column_drop on
209209
propagate_admission_header_to_leaf_transactions on
210210
propagate_input_ordering off
211211
recursion_depth_limit 1000
@@ -258,7 +258,7 @@ unsafe_allow_triggers_modifying_cascades off
258258
use_cputs_on_non_unique_indexes off
259259
use_declarative_schema_changer on
260260
use_improved_routine_dependency_tracking on
261-
use_improved_routine_deps_triggers_and_computed_cols off
261+
use_improved_routine_deps_triggers_and_computed_cols on
262262
use_pre_25_2_variadic_builtins off
263263
use_proc_txn_control_extended_protocol_fix on
264264
use_soft_limit_for_distribute_scan on

‎pkg/sql/logictest/testdata/logic_test/udf_insert‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ CREATE TABLE t_computed (
386386
# will depend on all columns in the table.
387387
statement ok
388388
SET use_improved_routine_dependency_tracking = false;
389+
SET use_improved_routine_deps_triggers_and_computed_cols = false;
389390

390391
statement ok
391392
CREATE FUNCTION f145098() RETURNS INT LANGUAGE SQL AS $$
@@ -395,6 +396,7 @@ $$;
395396

396397
statement ok
397398
RESET use_improved_routine_dependency_tracking;
399+
RESET use_improved_routine_deps_triggers_and_computed_cols;
398400

399401
statement error pgcode 2BP01 pq: cannot drop column "crdb_internal_a_shard_16" because function "f145098" depends on it
400402
DROP INDEX i;

‎pkg/sql/logictest/testdata/logic_test/udf_update‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,6 @@ subtest end
390390
# Prevent drop of column used in SET clause within a routine.
391391
subtest regression_158898
392392

393-
statement ok
394-
SET prevent_update_set_column_drop = true;
395-
396393
statement ok
397394
CREATE TABLE t158898 (col1 INT8 NOT NULL);
398395

@@ -408,17 +405,11 @@ statement ok
408405
DROP PROCEDURE p158898;
409406
DROP TABLE t158898;
410407

411-
statement ok
412-
RESET prevent_update_set_column_drop;
413-
414408
subtest end
415409

416410
# Allow drop of columns referenced only in computed column expressions.
417411
subtest regression_158154
418412

419-
statement ok
420-
SET use_improved_routine_deps_triggers_and_computed_cols = true;
421-
422413
statement ok
423414
CREATE TABLE t158154 (col1 INT8 NOT NULL, col2 TIMESTAMP NOT NULL, computed TIMESTAMP NOT NULL AS (col2) STORED);
424415
INSERT INTO t158154 (col1, col2) VALUES (1, '2024-01-01');
@@ -451,7 +442,4 @@ statement ok
451442
DROP PROCEDURE p158154;
452443
DROP TABLE t158154;
453444

454-
statement ok
455-
RESET use_improved_routine_deps_triggers_and_computed_cols;
456-
457445
subtest end

‎pkg/sql/vars.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4523,7 +4523,7 @@ var varGen = map[string]sessionVar{
45234523
Get: func(evalCtx *extendedEvalContext, _ *kv.Txn) (string, error) {
45244524
return formatBoolAsPostgresSetting(evalCtx.SessionData().PreventUpdateSetColumnDrop), nil
45254525
},
4526-
GlobalDefault: globalFalse,
4526+
GlobalDefault: globalTrue,
45274527
},
45284528

45294529
// CockroachDB extension.
@@ -4540,7 +4540,7 @@ var varGen = map[string]sessionVar{
45404540
Get: func(evalCtx *extendedEvalContext, _ *kv.Txn) (string, error) {
45414541
return formatBoolAsPostgresSetting(evalCtx.SessionData().UseImprovedRoutineDepsTriggersAndComputedCols), nil
45424542
},
4543-
GlobalDefault: globalFalse,
4543+
GlobalDefault: globalTrue,
45444544
},
45454545
}
45464546

0 commit comments

Comments
 (0)