Skip to content

Commit 7cc44c2

Browse files
logictest: update logictests data
Remove `skipif` from logictest testdata for local-mixed-25.3. Epic: none Release note: None
1 parent 642f0e9 commit 7cc44c2

File tree

2 files changed

+19
-29
lines changed

2 files changed

+19
-29
lines changed

pkg/sql/alter_job_owner.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package sql
88
import (
99
"context"
1010

11-
"github.com/cockroachdb/cockroach/pkg/clusterversion"
1211
"github.com/cockroachdb/cockroach/pkg/jobs"
1312
"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
1413
"github.com/cockroachdb/cockroach/pkg/security/username"
@@ -55,15 +54,6 @@ func (n *alterJobOwnerNode) startExec(params runParams) error {
5554
p := params.p
5655
newOwner := n.owner
5756

58-
// The top-level owner column this updates was added in 25.1.
59-
v, err := p.InternalSQLTxn().GetSystemSchemaVersion(ctx)
60-
if err != nil {
61-
return err
62-
}
63-
if !v.AtLeast(clusterversion.V25_1.Version()) {
64-
return pgerror.Newf(pgcode.FeatureNotSupported, "ALTER JOB OWNER requires version %s", clusterversion.V25_1)
65-
}
66-
6757
exprEval := p.ExprEvaluator("ALTER JOB OWNER")
6858
jobIDInt, err := exprEval.Int(ctx, n.jobID)
6959
if err != nil {

pkg/sql/logictest/testdata/logic_test/owner

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -258,46 +258,46 @@ DROP ROLE testuser
258258

259259
user root
260260

261-
skipif config local-mixed-25.2 local-mixed-25.3
261+
skipif config local-mixed-25.2
262262
let $testuser_job_id
263263
SELECT id FROM system.jobs WHERE owner = 'testuser' LIMIT 1
264264

265-
skipif config local-mixed-25.2 local-mixed-25.3
265+
skipif config local-mixed-25.2
266266
let $testuser2_job_id
267267
SELECT id FROM system.jobs WHERE owner = 'testuser2' LIMIT 1
268268

269-
skipif config local-mixed-25.2 local-mixed-25.3
269+
skipif config local-mixed-25.2
270270
let $node_job_id
271271
SELECT id FROM system.jobs WHERE owner = 'node' LIMIT 1
272272

273-
skipif config local-mixed-25.2 local-mixed-25.3
273+
skipif config local-mixed-25.2
274274
# Verify a simple transfer by an admin from testuser to testuser2 and back.
275275
statement ok
276276
ALTER JOB $testuser_job_id OWNER TO testuser2
277277

278-
skipif config local-mixed-25.2 local-mixed-25.3
278+
skipif config local-mixed-25.2
279279
query T
280280
SELECT owner FROM system.jobs WHERE id = $testuser_job_id
281281
----
282282
testuser2
283283

284-
skipif config local-mixed-25.2 local-mixed-25.3
284+
skipif config local-mixed-25.2
285285
statement ok
286286
ALTER JOB $testuser_job_id OWNER TO testuser
287287

288-
skipif config local-mixed-25.2 local-mixed-25.3
288+
skipif config local-mixed-25.2
289289
query T
290290
SELECT owner FROM system.jobs WHERE id = $testuser_job_id
291291
----
292292
testuser
293293

294294
# Verify that ownership cannot transfer to or from 'node'.
295295

296-
skipif config local-mixed-25.2 local-mixed-25.3
296+
skipif config local-mixed-25.2
297297
statement error cannot transfer ownership
298298
ALTER JOB $node_job_id OWNER TO testuser
299299

300-
skipif config local-mixed-25.2 local-mixed-25.3
300+
skipif config local-mixed-25.2
301301
statement error cannot transfer ownership
302302
ALTER JOB $testuser_job_id OWNER TO node
303303

@@ -316,58 +316,58 @@ CREATE USER testuser3
316316
statement ok
317317
GRANT testrole TO testuser3
318318

319-
skipif config local-mixed-25.2 local-mixed-25.3
319+
skipif config local-mixed-25.2
320320
statement ok
321321
ALTER JOB $testuser_job_id OWNER TO testrole
322322

323-
skipif config local-mixed-25.2 local-mixed-25.3
323+
skipif config local-mixed-25.2
324324
query T
325325
SELECT owner FROM system.jobs WHERE id = $testuser_job_id
326326
----
327327
testrole
328328

329-
skipif config local-mixed-25.2 local-mixed-25.3
329+
skipif config local-mixed-25.2
330330
# Verify testuser2 can transfer ownership to themselves and back to testuser.
331331
statement ok
332332
ALTER JOB $testuser_job_id OWNER TO testuser2
333333

334-
skipif config local-mixed-25.2 local-mixed-25.3
334+
skipif config local-mixed-25.2
335335
query T
336336
SELECT owner FROM system.jobs WHERE id = $testuser_job_id
337337
----
338338
testuser2
339339

340-
skipif config local-mixed-25.2 local-mixed-25.3
340+
skipif config local-mixed-25.2
341341
statement ok
342342
ALTER JOB $testuser_job_id OWNER TO testuser
343343

344-
skipif config local-mixed-25.2 local-mixed-25.3
344+
skipif config local-mixed-25.2
345345
query T
346346
SELECT owner FROM system.jobs WHERE id = $testuser_job_id
347347
----
348348
testuser
349349

350350
user testuser3
351351

352-
skipif config local-mixed-25.2 local-mixed-25.3
352+
skipif config local-mixed-25.2
353353
# Verify testuser3 cannot transfer since they do not own it, including via role.
354354
statement error testuser3 does not own job
355355
ALTER JOB $testuser_job_id OWNER TO testuser3
356356

357357
# Now move ownership to testrole so testuser3 can transfer it.
358358
user testuser2
359359

360-
skipif config local-mixed-25.2 local-mixed-25.3
360+
skipif config local-mixed-25.2
361361
statement ok
362362
ALTER JOB $testuser_job_id OWNER TO testrole
363363

364364
user testuser3
365365

366-
skipif config local-mixed-25.2 local-mixed-25.3
366+
skipif config local-mixed-25.2
367367
statement ok
368368
ALTER JOB $testuser_job_id OWNER TO testuser3
369369

370-
skipif config local-mixed-25.2 local-mixed-25.3
370+
skipif config local-mixed-25.2
371371
# Verify testuser3, who is not an admin, cannot transfer to otherrole which they
372372
# are not a member of.
373373
statement error testuser3 cannot transfer ownership to otherrole

0 commit comments

Comments
 (0)