mirror of
https://github.com/simonw/sqlite-utils.git
synced 2026-07-24 09:54:31 +02:00
Removed convert skip_false and --skip-false, closes #542
This commit is contained in:
parent
fafa966300
commit
96fab69256
8 changed files with 12 additions and 26 deletions
|
|
@ -80,7 +80,7 @@ def test_convert_import(test_db_and_path):
|
|||
db_path,
|
||||
"example",
|
||||
"dt",
|
||||
"return re.sub('O..', 'OXX', value)",
|
||||
"return re.sub('O..', 'OXX', value) if value else value",
|
||||
"--import",
|
||||
"re",
|
||||
],
|
||||
|
|
@ -223,7 +223,7 @@ def test_convert_output_column(test_db_and_path, drop):
|
|||
db_path,
|
||||
"example",
|
||||
"dt",
|
||||
"value.replace('October', 'Spooktober')",
|
||||
"value.replace('October', 'Spooktober') if value else value",
|
||||
"--output",
|
||||
"newcol",
|
||||
]
|
||||
|
|
@ -628,14 +628,8 @@ def test_convert_initialization_pattern(fresh_db_and_path):
|
|||
]
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"no_skip_false,expected",
|
||||
(
|
||||
(True, 1),
|
||||
(False, 0),
|
||||
),
|
||||
)
|
||||
def test_convert_no_skip_false(fresh_db_and_path, no_skip_false, expected):
|
||||
def test_convert_handles_falsey_values(fresh_db_and_path):
|
||||
# Falsey values like 0 should be converted (issue #527)
|
||||
db, db_path = fresh_db_and_path
|
||||
args = [
|
||||
"convert",
|
||||
|
|
@ -644,12 +638,10 @@ def test_convert_no_skip_false(fresh_db_and_path, no_skip_false, expected):
|
|||
"x",
|
||||
"-",
|
||||
]
|
||||
if no_skip_false:
|
||||
args.append("--no-skip-false")
|
||||
db["t"].insert_all([{"x": 0}, {"x": 1}])
|
||||
assert db["t"].get(1)["x"] == 0
|
||||
assert db["t"].get(2)["x"] == 1
|
||||
result = CliRunner().invoke(cli.cli, args, input="value + 1")
|
||||
assert result.exit_code == 0, result.output
|
||||
assert db["t"].get(1)["x"] == expected
|
||||
assert db["t"].get(1)["x"] == 1
|
||||
assert db["t"].get(2)["x"] == 2
|
||||
|
|
|
|||
|
|
@ -50,12 +50,13 @@ def test_convert_where(fresh_db, where, where_args):
|
|||
assert list(table.rows) == [{"id": 1, "title": "One"}, {"id": 2, "title": "TWO"}]
|
||||
|
||||
|
||||
def test_convert_skip_false(fresh_db):
|
||||
def test_convert_handles_falsey_values(fresh_db):
|
||||
# Falsey values like 0 should be converted (issue #527)
|
||||
table = fresh_db["table"]
|
||||
table.insert_all([{"x": 0}, {"x": 1}])
|
||||
assert table.get(1)["x"] == 0
|
||||
assert table.get(2)["x"] == 1
|
||||
table.convert("x", lambda x: x + 1, skip_false=False)
|
||||
table.convert("x", lambda x: x + 1)
|
||||
assert table.get(1)["x"] == 1
|
||||
assert table.get(2)["x"] == 2
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue