Revert "Fix kv set with a closure argument" (#15648)

Reverts nushell/nushell#15588 (see comments there)
This commit is contained in:
Douglas 2025-04-26 23:00:00 -04:00 committed by GitHub
parent a3aae2d26c
commit 5fecf59f54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 43 deletions

View File

@ -38,7 +38,7 @@ export def "kv set" [
# If passed a closure, execute it # If passed a closure, execute it
let arg_type = ($value_or_closure | describe) let arg_type = ($value_or_closure | describe)
let value = match $arg_type { let value = match $arg_type {
closure => { kv get $key --universal=$universal | do $value_or_closure } closure => { $input | do $value_or_closure }
_ => ($value_or_closure | default $input) _ => ($value_or_closure | default $input)
} }

View File

@ -83,7 +83,7 @@ def local-transpose_to_record [] {
} }
@test @test
def local-using_cellpaths [] { def local-using_closure [] {
if ('sqlite' not-in (version).features) { return } if ('sqlite' not-in (version).features) { return }
let key = (random uuid) let key = (random uuid)
@ -91,8 +91,8 @@ def local-using_cellpaths [] {
let size_key = (random uuid) let size_key = (random uuid)
ls ls
| kv set $name_key $in.name | kv set $name_key { get name }
| kv set $size_key $in.size | kv set $size_key { get size }
let expected = "list<string>" let expected = "list<string>"
let actual = (kv get $name_key | describe) let actual = (kv get $name_key | describe)
@ -106,22 +106,6 @@ def local-using_cellpaths [] {
kv drop $size_key kv drop $size_key
} }
@test
def local-using_closure [] {
if ('sqlite' not-in (version).features) { return }
let key = (random uuid)
kv set $key 5
kv set $key { $in + 1 }
let expected = 6
let actual = (kv get $key)
assert equal $actual $expected
kv drop $key
}
@test @test
def local-return-entire-list [] { def local-return-entire-list [] {
if ('sqlite' not-in (version).features) { return } if ('sqlite' not-in (version).features) { return }
@ -153,7 +137,7 @@ def local-return_value_only [] {
let key = (random uuid) let key = (random uuid)
let expected = 'VALUE' let expected = 'VALUE'
let actual = ('value' | kv set -r v $key ($in | str upcase)) let actual = ('value' | kv set -r v $key {str upcase})
assert equal $actual $expected assert equal $actual $expected
@ -249,7 +233,7 @@ def universal-transpose_to_record [] {
} }
@test @test
def universal-using_cellpaths [] { def universal-using_closure [] {
if ('sqlite' not-in (version).features) { return } if ('sqlite' not-in (version).features) { return }
let key = (random uuid) let key = (random uuid)
@ -259,8 +243,8 @@ def universal-using_cellpaths [] {
let size_key = (random uuid) let size_key = (random uuid)
ls ls
| kv set -u $name_key $in.name | kv set -u $name_key { get name }
| kv set -u $size_key $in.size | kv set -u $size_key { get size }
let expected = "list<string>" let expected = "list<string>"
let actual = (kv get -u $name_key | describe) let actual = (kv get -u $name_key | describe)
@ -275,24 +259,6 @@ def universal-using_cellpaths [] {
rm $env.NU_UNIVERSAL_KV_PATH rm $env.NU_UNIVERSAL_KV_PATH
} }
@test
def universal-using_closure [] {
if ('sqlite' not-in (version).features) { return }
let key = (random uuid)
$env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
kv set -u $key 5
kv set -u $key { $in + 1 }
let expected = 6
let actual = (kv get -u $key)
assert equal $actual $expected
kv drop -u $key
rm $env.NU_UNIVERSAL_KV_PATH
}
@test @test
def universal-return-entire-list [] { def universal-return-entire-list [] {
if ('sqlite' not-in (version).features) { return } if ('sqlite' not-in (version).features) { return }
@ -329,7 +295,7 @@ def universal-return_value_only [] {
let key = (random uuid) let key = (random uuid)
let expected = 'VALUE' let expected = 'VALUE'
let actual = ('value' | kv set --universal -r v $key ($in | str upcase)) let actual = ('value' | kv set --universal -r v $key {str upcase})
assert equal $actual $expected assert equal $actual $expected