mirror of
https://github.com/simonw/sqlite-utils.git
synced 2026-07-26 10:54:32 +02:00
Compare commits
2 commits
main
...
say-5/docu
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e38d701fb1 | ||
|
|
36a34e95bf |
61 changed files with 1077 additions and 1787 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -15,7 +15,6 @@ venv
|
||||||
.schema
|
.schema
|
||||||
.vscode
|
.vscode
|
||||||
.hypothesis
|
.hypothesis
|
||||||
.claude/
|
|
||||||
Pipfile
|
Pipfile
|
||||||
Pipfile.lock
|
Pipfile.lock
|
||||||
uv.lock
|
uv.lock
|
||||||
|
|
|
||||||
1
Justfile
1
Justfile
|
|
@ -16,7 +16,6 @@
|
||||||
uv run ty check sqlite_utils
|
uv run ty check sqlite_utils
|
||||||
uv run cog --check README.md docs/*.rst
|
uv run cog --check README.md docs/*.rst
|
||||||
uv run --group docs codespell docs/*.rst --ignore-words docs/codespell-ignore-words.txt
|
uv run --group docs codespell docs/*.rst --ignore-words docs/codespell-ignore-words.txt
|
||||||
uv run --group docs codespell sqlite_utils --ignore-words docs/codespell-ignore-words.txt
|
|
||||||
|
|
||||||
# Rebuild docs with cog
|
# Rebuild docs with cog
|
||||||
@cog:
|
@cog:
|
||||||
|
|
|
||||||
|
|
@ -4,32 +4,14 @@
|
||||||
Changelog
|
Changelog
|
||||||
===========
|
===========
|
||||||
|
|
||||||
.. _v3_39_1:
|
.. _v_unreleased:
|
||||||
|
|
||||||
3.39.1 (2026-07-25)
|
Unreleased
|
||||||
-------------------
|
----------
|
||||||
|
|
||||||
- Fixed a bug where ``table.delete_where()`` left the connection in an open transaction, causing deleted rows to be silently restored when the connection was closed. (:issue:`815`)
|
|
||||||
|
|
||||||
.. _v4_1_1:
|
|
||||||
|
|
||||||
4.1.1 (2026-07-12)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
- ``table.transform()`` now raises a ``TransactionError`` if called while a transaction is open with ``PRAGMA foreign_keys`` enabled and the table is referenced by foreign keys with destructive ``ON DELETE`` actions - ``CASCADE``, ``SET NULL`` or ``SET DEFAULT``. The pragma cannot be changed inside a transaction, so previously dropping the old table as part of the transform could fire those actions and silently delete or modify referencing rows. See :ref:`python_api_transform_foreign_keys_transactions` for details and workarounds. (:issue:`794`)
|
|
||||||
- The :ref:`CLI <cli>` and :ref:`Python API <python_api>` documentation now cross-reference each other: CLI sections link to the equivalent Python API functionality and Python API sections link back to the corresponding CLI command. (:issue:`791`)
|
|
||||||
.. _v4_1:
|
|
||||||
|
|
||||||
4.1 (2026-07-11)
|
|
||||||
----------------
|
|
||||||
|
|
||||||
|
- ``sqlite-utils query`` can now read the SQL query from standard input by passing ``-`` in place of the query, for example ``echo "select * from dogs" | sqlite-utils query dogs.db -``. (:issue:`765`)
|
||||||
- ``sqlite-utils insert`` and ``sqlite-utils upsert`` now accept a ``--code`` option for :ref:`providing a block of Python code <cli_insert_code>` (or a path to a ``.py`` file) that defines a ``rows()`` function or ``rows`` iterable of rows to insert, as an alternative to importing from a file. (:issue:`684`)
|
- ``sqlite-utils insert`` and ``sqlite-utils upsert`` now accept a ``--code`` option for :ref:`providing a block of Python code <cli_insert_code>` (or a path to a ``.py`` file) that defines a ``rows()`` function or ``rows`` iterable of rows to insert, as an alternative to importing from a file. (:issue:`684`)
|
||||||
- ``sqlite-utils insert`` and ``sqlite-utils upsert`` now accept ``--type column-name type`` to :ref:`override the type automatically chosen when the table is created <cli_insert_csv_tsv_column_types>`. This is useful for CSV or TSV columns such as ZIP codes that look like integers but should be stored as ``TEXT`` to preserve leading zeros. (:issue:`131`)
|
- ``sqlite-utils insert`` and ``sqlite-utils upsert`` now accept ``--type column-name type`` to :ref:`override the type automatically chosen when the table is created <cli_insert_csv_tsv_column_types>`. This is useful for CSV or TSV columns such as ZIP codes that look like integers but should be stored as ``TEXT`` to preserve leading zeros. (:issue:`131`)
|
||||||
- New ``table.drop_index(name)`` method and ``sqlite-utils drop-index`` command for dropping an index by name. Both accept ``ignore=True``/``--ignore`` to ignore a missing index. (:issue:`626`)
|
|
||||||
- ``sqlite-utils query`` can now read the SQL query from standard input by passing ``-`` in place of the query, for example ``echo "select * from dogs" | sqlite-utils query dogs.db -``. (:issue:`765`)
|
|
||||||
- ``sqlite-utils upsert`` can now infer the primary key of an existing table, so ``--pk`` can be omitted when upserting into a table that already has a primary key.
|
|
||||||
- ``table.transform()`` and ``table.transform_sql()`` now accept ``strict=True`` or ``strict=False`` to change a table's `SQLite strict mode <https://www.sqlite.org/stricttables.html>`__. Omitting the option preserves the existing mode. (:issue:`787`)
|
|
||||||
- The ``sqlite-utils transform`` command now accepts ``--strict`` and ``--no-strict`` to change a table's strict mode. (:issue:`787`)
|
|
||||||
|
|
||||||
.. _v4_0:
|
.. _v4_0:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ This page lists the ``--help`` for every ``sqlite-utils`` CLI sub-command.
|
||||||
go_first = [
|
go_first = [
|
||||||
"query", "memory", "insert", "upsert", "bulk", "search", "transform", "extract",
|
"query", "memory", "insert", "upsert", "bulk", "search", "transform", "extract",
|
||||||
"schema", "insert-files", "analyze-tables", "convert", "tables", "views", "rows",
|
"schema", "insert-files", "analyze-tables", "convert", "tables", "views", "rows",
|
||||||
"triggers", "indexes", "create-database", "create-table", "create-index", "drop-index",
|
"triggers", "indexes", "create-database", "create-table", "create-index",
|
||||||
"migrate", "enable-fts", "populate-fts", "rebuild-fts", "disable-fts"
|
"migrate", "enable-fts", "populate-fts", "rebuild-fts", "disable-fts"
|
||||||
]
|
]
|
||||||
refs = {
|
refs = {
|
||||||
|
|
@ -46,7 +46,6 @@ This page lists the ``--help`` for every ``sqlite-utils`` CLI sub-command.
|
||||||
"add-foreign-keys": "cli_add_foreign_keys",
|
"add-foreign-keys": "cli_add_foreign_keys",
|
||||||
"index-foreign-keys": "cli_index_foreign_keys",
|
"index-foreign-keys": "cli_index_foreign_keys",
|
||||||
"create-index": "cli_create_index",
|
"create-index": "cli_create_index",
|
||||||
"drop-index": "cli_drop_index",
|
|
||||||
"enable-wal": "cli_wal",
|
"enable-wal": "cli_wal",
|
||||||
"enable-counts": "cli_enable_counts",
|
"enable-counts": "cli_enable_counts",
|
||||||
"bulk": "cli_bulk",
|
"bulk": "cli_bulk",
|
||||||
|
|
@ -508,8 +507,6 @@ See :ref:`cli_transform_table`.
|
||||||
Add a foreign key constraint from a column to
|
Add a foreign key constraint from a column to
|
||||||
another table with another column
|
another table with another column
|
||||||
--drop-foreign-key TEXT Drop foreign key constraint for this column
|
--drop-foreign-key TEXT Drop foreign key constraint for this column
|
||||||
--strict / --no-strict Enable or disable STRICT mode (default:
|
|
||||||
preserve current mode)
|
|
||||||
--sql Output SQL without executing it
|
--sql Output SQL without executing it
|
||||||
--load-extension TEXT Path to SQLite extension, with optional
|
--load-extension TEXT Path to SQLite extension, with optional
|
||||||
:entrypoint
|
:entrypoint
|
||||||
|
|
@ -662,7 +659,7 @@ See :ref:`cli_convert`.
|
||||||
Convert a string like a,b,c into a JSON array ["a", "b", "c"]
|
Convert a string like a,b,c into a JSON array ["a", "b", "c"]
|
||||||
|
|
||||||
r.parsedate(value: 'str', dayfirst: 'bool' = False, yearfirst: 'bool' = False,
|
r.parsedate(value: 'str', dayfirst: 'bool' = False, yearfirst: 'bool' = False,
|
||||||
errors: 'object | None' = None) -> 'str | None'
|
errors: 'Optional[object]' = None) -> 'Optional[str]'
|
||||||
|
|
||||||
Parse a date and convert it to ISO date format: yyyy-mm-dd
|
Parse a date and convert it to ISO date format: yyyy-mm-dd
|
||||||
- dayfirst=True: treat xx as the day in xx/yy/zz
|
- dayfirst=True: treat xx as the day in xx/yy/zz
|
||||||
|
|
@ -671,7 +668,7 @@ See :ref:`cli_convert`.
|
||||||
- errors=r.SET_NULL to set values that cannot be parsed to null
|
- errors=r.SET_NULL to set values that cannot be parsed to null
|
||||||
|
|
||||||
r.parsedatetime(value: 'str', dayfirst: 'bool' = False, yearfirst: 'bool' =
|
r.parsedatetime(value: 'str', dayfirst: 'bool' = False, yearfirst: 'bool' =
|
||||||
False, errors: 'object | None' = None) -> 'str | None'
|
False, errors: 'Optional[object]' = None) -> 'Optional[str]'
|
||||||
|
|
||||||
Parse a datetime and convert it to ISO datetime format: yyyy-mm-ddTHH:MM:SS
|
Parse a datetime and convert it to ISO datetime format: yyyy-mm-ddTHH:MM:SS
|
||||||
- dayfirst=True: treat xx as the day in xx/yy/zz
|
- dayfirst=True: treat xx as the day in xx/yy/zz
|
||||||
|
|
@ -1009,29 +1006,6 @@ See :ref:`cli_create_index`.
|
||||||
-h, --help Show this message and exit.
|
-h, --help Show this message and exit.
|
||||||
|
|
||||||
|
|
||||||
.. _cli_ref_drop_index:
|
|
||||||
|
|
||||||
drop-index
|
|
||||||
==========
|
|
||||||
|
|
||||||
See :ref:`cli_drop_index`.
|
|
||||||
|
|
||||||
::
|
|
||||||
|
|
||||||
Usage: sqlite-utils drop-index [OPTIONS] PATH TABLE INDEX
|
|
||||||
|
|
||||||
Drop an index by index name from the specified table
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
sqlite-utils drop-index chickens.db chickens idx_chickens_name
|
|
||||||
|
|
||||||
Options:
|
|
||||||
--ignore Ignore if index does not exist
|
|
||||||
--load-extension TEXT Path to SQLite extension, with optional :entrypoint
|
|
||||||
-h, --help Show this message and exit.
|
|
||||||
|
|
||||||
|
|
||||||
.. _cli_ref_migrate:
|
.. _cli_ref_migrate:
|
||||||
|
|
||||||
migrate
|
migrate
|
||||||
|
|
|
||||||
119
docs/cli.rst
119
docs/cli.rst
|
|
@ -361,7 +361,7 @@ To return the first column of each result as raw data, separated by newlines, us
|
||||||
Using named parameters
|
Using named parameters
|
||||||
----------------------
|
----------------------
|
||||||
|
|
||||||
You can pass named parameters to the query using ``-p name value``:
|
You can pass named parameters to the query using ``-p``:
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
|
|
@ -424,9 +424,6 @@ The ``--functions`` option can be used multiple times to load functions from mul
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
return urlparse(url).path'
|
return urlparse(url).path'
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.register_function() <python_api_register_function>`
|
|
||||||
|
|
||||||
.. _cli_query_extensions:
|
.. _cli_query_extensions:
|
||||||
|
|
||||||
SQLite extensions
|
SQLite extensions
|
||||||
|
|
@ -1027,9 +1024,6 @@ To show more than 10 common values, use ``--common-limit 20``. To skip the most
|
||||||
|
|
||||||
sqlite-utils analyze-tables github.db tags --common-limit 20 --no-least
|
sqlite-utils analyze-tables github.db tags --common-limit 20 --no-least
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.analyze_column() <python_api_analyze_column>` CLI reference: :ref:`sqlite-utils analyze-tables <cli_ref_analyze_tables>`
|
|
||||||
|
|
||||||
.. _cli_analyze_tables_save:
|
.. _cli_analyze_tables_save:
|
||||||
|
|
||||||
Saving the analyzed table details
|
Saving the analyzed table details
|
||||||
|
|
@ -1197,9 +1191,6 @@ You can delete all the existing rows in the table before inserting the new recor
|
||||||
|
|
||||||
You can add the ``--analyze`` option to run ``ANALYZE`` against the table after the rows have been inserted.
|
You can add the ``--analyze`` option to run ``ANALYZE`` against the table after the rows have been inserted.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.insert_all() <python_api_bulk_inserts>` CLI reference: :ref:`sqlite-utils insert <cli_ref_insert>`
|
|
||||||
|
|
||||||
.. _cli_inserting_data_binary:
|
.. _cli_inserting_data_binary:
|
||||||
|
|
||||||
Inserting binary data
|
Inserting binary data
|
||||||
|
|
@ -1624,9 +1615,6 @@ To replace a dog with in ID of 2 with a new record, run the following:
|
||||||
echo '{"id": 2, "name": "Pancakes", "age": 3}' | \
|
echo '{"id": 2, "name": "Pancakes", "age": 3}' | \
|
||||||
sqlite-utils insert dogs.db dogs - --pk=id --replace
|
sqlite-utils insert dogs.db dogs - --pk=id --replace
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.insert(..., replace=True) <python_api_insert_replace>` CLI reference: :ref:`sqlite-utils insert <cli_ref_insert>`
|
|
||||||
|
|
||||||
.. _cli_upsert:
|
.. _cli_upsert:
|
||||||
|
|
||||||
Upserting data
|
Upserting data
|
||||||
|
|
@ -1653,9 +1641,6 @@ The command will fail if you reference columns that do not exist on the table. T
|
||||||
``upsert`` in sqlite-utils 1.x worked like ``insert ... --replace`` does in 2.x. See `issue #66 <https://github.com/simonw/sqlite-utils/issues/66>`__ for details of this change.
|
``upsert`` in sqlite-utils 1.x worked like ``insert ... --replace`` does in 2.x. See `issue #66 <https://github.com/simonw/sqlite-utils/issues/66>`__ for details of this change.
|
||||||
|
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.upsert() <python_api_upsert>` CLI reference: :ref:`sqlite-utils upsert <cli_ref_upsert>`
|
|
||||||
|
|
||||||
.. _cli_bulk:
|
.. _cli_bulk:
|
||||||
|
|
||||||
Executing SQL in bulk
|
Executing SQL in bulk
|
||||||
|
|
@ -1857,9 +1842,6 @@ You can include named parameters in your where clause and populate them using on
|
||||||
|
|
||||||
The ``--dry-run`` option will output a preview of the conversion against the first ten rows, without modifying the database.
|
The ``--dry-run`` option will output a preview of the conversion against the first ten rows, without modifying the database.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.convert() <python_api_convert>` CLI reference: :ref:`sqlite-utils convert <cli_ref_convert>`
|
|
||||||
|
|
||||||
.. _cli_convert_import:
|
.. _cli_convert_import:
|
||||||
|
|
||||||
Importing additional modules
|
Importing additional modules
|
||||||
|
|
@ -2158,9 +2140,6 @@ If a table with the same name already exists, you will get an error. You can cho
|
||||||
|
|
||||||
You can also pass ``--transform`` to transform the existing table to match the new schema. See :ref:`python_api_explicit_create` in the Python library documentation for details of how this option works.
|
You can also pass ``--transform`` to transform the existing table to match the new schema. See :ref:`python_api_explicit_create` in the Python library documentation for details of how this option works.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.create() <python_api_explicit_create>` CLI reference: :ref:`sqlite-utils create-table <cli_ref_create_table>`
|
|
||||||
|
|
||||||
.. _cli_renaming_tables:
|
.. _cli_renaming_tables:
|
||||||
|
|
||||||
Renaming a table
|
Renaming a table
|
||||||
|
|
@ -2174,9 +2153,6 @@ Yo ucan rename a table using the ``rename-table`` command:
|
||||||
|
|
||||||
Pass ``--ignore`` to ignore any errors caused by the table not existing, or the new name already being in use.
|
Pass ``--ignore`` to ignore any errors caused by the table not existing, or the new name already being in use.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.rename_table() <python_api_rename_table>` CLI reference: :ref:`sqlite-utils rename-table <cli_ref_rename_table>`
|
|
||||||
|
|
||||||
.. _cli_duplicate_table:
|
.. _cli_duplicate_table:
|
||||||
|
|
||||||
Duplicating tables
|
Duplicating tables
|
||||||
|
|
@ -2188,9 +2164,6 @@ The ``duplicate`` command duplicates a table - creating a new table with the sam
|
||||||
|
|
||||||
sqlite-utils duplicate books.db authors authors_copy
|
sqlite-utils duplicate books.db authors authors_copy
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.duplicate() <python_api_duplicate>` CLI reference: :ref:`sqlite-utils duplicate <cli_ref_duplicate>`
|
|
||||||
|
|
||||||
.. _cli_drop_table:
|
.. _cli_drop_table:
|
||||||
|
|
||||||
Dropping tables
|
Dropping tables
|
||||||
|
|
@ -2204,15 +2177,12 @@ You can drop a table using the ``drop-table`` command:
|
||||||
|
|
||||||
Use ``--ignore`` to ignore the error if the table does not exist.
|
Use ``--ignore`` to ignore the error if the table does not exist.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.drop() <python_api_drop>` CLI reference: :ref:`sqlite-utils drop-table <cli_ref_drop_table>`
|
|
||||||
|
|
||||||
.. _cli_transform_table:
|
.. _cli_transform_table:
|
||||||
|
|
||||||
Transforming tables
|
Transforming tables
|
||||||
===================
|
===================
|
||||||
|
|
||||||
The ``transform`` command allows you to apply complex transformations to a table that cannot be implemented using a regular SQLite ``ALTER TABLE`` command. See :ref:`python_api_transform` for details of how this works. By default, the ``transform`` command preserves a table's ``STRICT`` mode.
|
The ``transform`` command allows you to apply complex transformations to a table that cannot be implemented using a regular SQLite ``ALTER TABLE`` command. See :ref:`python_api_transform` for details of how this works. The ``transform`` command preserves a table's ``STRICT`` mode.
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
|
|
@ -2258,12 +2228,6 @@ Every option for this table (with the exception of ``--pk-none``) can be specifi
|
||||||
``--add-foreign-key column other_table other_column``
|
``--add-foreign-key column other_table other_column``
|
||||||
Add a foreign key constraint to ``column`` pointing to ``other_table.other_column``.
|
Add a foreign key constraint to ``column`` pointing to ``other_table.other_column``.
|
||||||
|
|
||||||
``--strict``
|
|
||||||
Convert the table to a `SQLite STRICT table <https://www.sqlite.org/stricttables.html>`__. The command fails if the available SQLite version does not support strict tables. If existing rows contain values that are incompatible with their declared column types the transformation fails and the original table is left unchanged.
|
|
||||||
|
|
||||||
``--no-strict``
|
|
||||||
Convert a strict table back to a regular non-strict table.
|
|
||||||
|
|
||||||
If you want to see the SQL that will be executed to make the change without actually executing it, add the ``--sql`` flag. For example:
|
If you want to see the SQL that will be executed to make the change without actually executing it, add the ``--sql`` flag. For example:
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
@ -2290,9 +2254,6 @@ If you want to see the SQL that will be executed to make the change without actu
|
||||||
DROP TABLE "roadside_attractions";
|
DROP TABLE "roadside_attractions";
|
||||||
ALTER TABLE "roadside_attractions_new_4033a60276b9" RENAME TO "roadside_attractions";
|
ALTER TABLE "roadside_attractions_new_4033a60276b9" RENAME TO "roadside_attractions";
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.transform() <python_api_transform>` CLI reference: :ref:`sqlite-utils transform <cli_ref_transform>`
|
|
||||||
|
|
||||||
.. _cli_transform_table_add_primary_key_to_rowid:
|
.. _cli_transform_table_add_primary_key_to_rowid:
|
||||||
|
|
||||||
Adding a primary key to a rowid table
|
Adding a primary key to a rowid table
|
||||||
|
|
@ -2470,9 +2431,6 @@ After running the above, the command ``sqlite-utils schema global.db`` reveals t
|
||||||
CREATE UNIQUE INDEX "idx_countries_country_name"
|
CREATE UNIQUE INDEX "idx_countries_country_name"
|
||||||
ON "countries" ("country", "name");
|
ON "countries" ("country", "name");
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.extract() <python_api_extract>` CLI reference: :ref:`sqlite-utils extract <cli_ref_extract>`
|
|
||||||
|
|
||||||
.. _cli_create_view:
|
.. _cli_create_view:
|
||||||
|
|
||||||
Creating views
|
Creating views
|
||||||
|
|
@ -2494,9 +2452,6 @@ You can create a view using the ``create-view`` command:
|
||||||
|
|
||||||
Use ``--replace`` to replace an existing view of the same name, and ``--ignore`` to do nothing if a view already exists.
|
Use ``--replace`` to replace an existing view of the same name, and ``--ignore`` to do nothing if a view already exists.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.create_view() <python_api_create_view>` CLI reference: :ref:`sqlite-utils create-view <cli_ref_create_view>`
|
|
||||||
|
|
||||||
.. _cli_drop_view:
|
.. _cli_drop_view:
|
||||||
|
|
||||||
Dropping views
|
Dropping views
|
||||||
|
|
@ -2510,9 +2465,6 @@ You can drop a view using the ``drop-view`` command:
|
||||||
|
|
||||||
Use ``--ignore`` to ignore the error if the view does not exist.
|
Use ``--ignore`` to ignore the error if the view does not exist.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`view.drop() <python_api_drop>` CLI reference: :ref:`sqlite-utils drop-view <cli_ref_drop_view>`
|
|
||||||
|
|
||||||
.. _cli_add_column:
|
.. _cli_add_column:
|
||||||
|
|
||||||
Adding columns
|
Adding columns
|
||||||
|
|
@ -2553,9 +2505,6 @@ You can set a ``NOT NULL DEFAULT 'x'`` constraint on the new column using ``--no
|
||||||
|
|
||||||
sqlite-utils add-column mydb.db dogs friends_count integer --not-null-default 0
|
sqlite-utils add-column mydb.db dogs friends_count integer --not-null-default 0
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.add_column() <python_api_add_column>` CLI reference: :ref:`sqlite-utils add-column <cli_ref_add_column>`
|
|
||||||
|
|
||||||
.. _cli_add_column_alter:
|
.. _cli_add_column_alter:
|
||||||
|
|
||||||
Adding columns automatically on insert/update
|
Adding columns automatically on insert/update
|
||||||
|
|
@ -2567,9 +2516,6 @@ You can use the ``--alter`` option to automatically add new columns if the data
|
||||||
|
|
||||||
sqlite-utils insert dogs.db dogs new-dogs.json --pk=id --alter
|
sqlite-utils insert dogs.db dogs new-dogs.json --pk=id --alter
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.insert(..., alter=True) <python_api_add_column_alter>`
|
|
||||||
|
|
||||||
.. _cli_add_foreign_key:
|
.. _cli_add_foreign_key:
|
||||||
|
|
||||||
Adding foreign key constraints
|
Adding foreign key constraints
|
||||||
|
|
@ -2597,9 +2543,6 @@ Add ``--ignore`` to ignore an existing foreign key (as opposed to returning an e
|
||||||
|
|
||||||
See :ref:`python_api_add_foreign_key` in the Python API documentation for further details, including how the automatic table guessing mechanism works.
|
See :ref:`python_api_add_foreign_key` in the Python API documentation for further details, including how the automatic table guessing mechanism works.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.add_foreign_key() <python_api_add_foreign_key>` CLI reference: :ref:`sqlite-utils add-foreign-key <cli_ref_add_foreign_key>`
|
|
||||||
|
|
||||||
.. _cli_add_foreign_keys:
|
.. _cli_add_foreign_keys:
|
||||||
|
|
||||||
Adding multiple foreign keys at once
|
Adding multiple foreign keys at once
|
||||||
|
|
@ -2615,9 +2558,6 @@ Adding a foreign key requires a ``VACUUM``. On large databases this can be an ex
|
||||||
|
|
||||||
When you are using this command each foreign key needs to be defined in full, as four arguments - the table, column, other table and other column.
|
When you are using this command each foreign key needs to be defined in full, as four arguments - the table, column, other table and other column.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.add_foreign_keys() <python_api_add_foreign_keys>` CLI reference: :ref:`sqlite-utils add-foreign-keys <cli_ref_add_foreign_keys>`
|
|
||||||
|
|
||||||
.. _cli_index_foreign_keys:
|
.. _cli_index_foreign_keys:
|
||||||
|
|
||||||
Adding indexes for all foreign keys
|
Adding indexes for all foreign keys
|
||||||
|
|
@ -2629,9 +2569,6 @@ If you want to ensure that every foreign key column in your database has a corre
|
||||||
|
|
||||||
sqlite-utils index-foreign-keys books.db
|
sqlite-utils index-foreign-keys books.db
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.index_foreign_keys() <python_api_index_foreign_keys>` CLI reference: :ref:`sqlite-utils index-foreign-keys <cli_ref_index_foreign_keys>`
|
|
||||||
|
|
||||||
.. _cli_defaults_not_null:
|
.. _cli_defaults_not_null:
|
||||||
|
|
||||||
Setting defaults and not null constraints
|
Setting defaults and not null constraints
|
||||||
|
|
@ -2647,9 +2584,6 @@ You can use the ``--not-null`` and ``--default`` options (to both ``insert`` and
|
||||||
--default age 2 \
|
--default age 2 \
|
||||||
--default score 5
|
--default score 5
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`not_null= and defaults= arguments <python_api_defaults_not_null>`
|
|
||||||
|
|
||||||
.. _cli_create_index:
|
.. _cli_create_index:
|
||||||
|
|
||||||
Creating indexes
|
Creating indexes
|
||||||
|
|
@ -2681,25 +2615,6 @@ If your column names are already prefixed with a hyphen you'll need to manually
|
||||||
|
|
||||||
Add the ``--analyze`` option to run ``ANALYZE`` against the index after it has been created.
|
Add the ``--analyze`` option to run ``ANALYZE`` against the index after it has been created.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.create_index() <python_api_create_index>` CLI reference: :ref:`sqlite-utils create-index <cli_ref_create_index>`
|
|
||||||
|
|
||||||
.. _cli_drop_index:
|
|
||||||
|
|
||||||
Dropping indexes
|
|
||||||
================
|
|
||||||
|
|
||||||
You can drop an index from an existing table using the ``drop-index`` command:
|
|
||||||
|
|
||||||
.. code-block:: bash
|
|
||||||
|
|
||||||
sqlite-utils drop-index mydb.db mytable idx_mytable_col1
|
|
||||||
|
|
||||||
Use ``--ignore`` to ignore the error if the index does not exist on that table.
|
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.drop_index() <python_api_create_index>` CLI reference: :ref:`sqlite-utils drop-index <cli_ref_drop_index>`
|
|
||||||
|
|
||||||
.. _cli_fts:
|
.. _cli_fts:
|
||||||
|
|
||||||
Configuring full-text search
|
Configuring full-text search
|
||||||
|
|
@ -2753,9 +2668,6 @@ You can rebuild every FTS table by running ``rebuild-fts`` without passing any t
|
||||||
|
|
||||||
sqlite-utils rebuild-fts mydb.db
|
sqlite-utils rebuild-fts mydb.db
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.enable_fts() <python_api_fts_enable>` CLI reference: :ref:`sqlite-utils enable-fts <cli_ref_enable_fts>`
|
|
||||||
|
|
||||||
.. _cli_search:
|
.. _cli_search:
|
||||||
|
|
||||||
Executing searches
|
Executing searches
|
||||||
|
|
@ -2812,9 +2724,6 @@ Use the ``--sql`` option to output the SQL that would be executed, rather than r
|
||||||
order by
|
order by
|
||||||
"documents_fts".rank
|
"documents_fts".rank
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.search() <python_api_fts_search>` CLI reference: :ref:`sqlite-utils search <cli_ref_search>`
|
|
||||||
|
|
||||||
.. _cli_enable_counts:
|
.. _cli_enable_counts:
|
||||||
|
|
||||||
Enabling cached counts
|
Enabling cached counts
|
||||||
|
|
@ -2838,9 +2747,6 @@ If the ``_counts`` table ever becomes out-of-sync with the actual table counts y
|
||||||
|
|
||||||
sqlite-utils reset-counts mydb.db
|
sqlite-utils reset-counts mydb.db
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.enable_counts() <python_api_cached_table_counts>` CLI reference: :ref:`sqlite-utils enable-counts <cli_ref_enable_counts>`
|
|
||||||
|
|
||||||
.. _cli_analyze:
|
.. _cli_analyze:
|
||||||
|
|
||||||
Optimizing index usage with ANALYZE
|
Optimizing index usage with ANALYZE
|
||||||
|
|
@ -2864,9 +2770,6 @@ You can run it against specific tables, or against specific named indexes, by pa
|
||||||
|
|
||||||
You can also run ``ANALYZE`` as part of another command using the ``--analyze`` option. This is supported by the ``create-index``, ``insert`` and ``upsert`` commands.
|
You can also run ``ANALYZE`` as part of another command using the ``--analyze`` option. This is supported by the ``create-index``, ``insert`` and ``upsert`` commands.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.analyze() <python_api_analyze>` CLI reference: :ref:`sqlite-utils analyze <cli_ref_analyze>`
|
|
||||||
|
|
||||||
.. _cli_vacuum:
|
.. _cli_vacuum:
|
||||||
|
|
||||||
Vacuum
|
Vacuum
|
||||||
|
|
@ -2878,9 +2781,6 @@ You can run VACUUM to optimize your database like so:
|
||||||
|
|
||||||
sqlite-utils vacuum mydb.db
|
sqlite-utils vacuum mydb.db
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.vacuum() <python_api_vacuum>` CLI reference: :ref:`sqlite-utils vacuum <cli_ref_vacuum>`
|
|
||||||
|
|
||||||
.. _cli_optimize:
|
.. _cli_optimize:
|
||||||
|
|
||||||
Optimize
|
Optimize
|
||||||
|
|
@ -2904,9 +2804,6 @@ To optimize specific tables rather than every FTS table, pass those tables as ex
|
||||||
|
|
||||||
sqlite-utils optimize mydb.db table_1 table_2
|
sqlite-utils optimize mydb.db table_1 table_2
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.optimize() <python_api_fts_optimize>` CLI reference: :ref:`sqlite-utils optimize <cli_ref_optimize>`
|
|
||||||
|
|
||||||
.. _cli_wal:
|
.. _cli_wal:
|
||||||
|
|
||||||
WAL mode
|
WAL mode
|
||||||
|
|
@ -2926,9 +2823,6 @@ You can disable WAL mode using ``disable-wal``:
|
||||||
|
|
||||||
Both of these commands accept one or more database files as arguments.
|
Both of these commands accept one or more database files as arguments.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.enable_wal() and db.disable_wal() <python_api_wal>` CLI reference: :ref:`sqlite-utils enable-wal <cli_ref_enable_wal>`
|
|
||||||
|
|
||||||
.. _cli_dump:
|
.. _cli_dump:
|
||||||
|
|
||||||
Dumping the database to SQL
|
Dumping the database to SQL
|
||||||
|
|
@ -2944,9 +2838,6 @@ The ``dump`` command outputs a SQL dump of the schema and full contents of the s
|
||||||
...
|
...
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`db.iterdump() <python_api_itedump>` CLI reference: :ref:`sqlite-utils dump <cli_ref_dump>`
|
|
||||||
|
|
||||||
.. _cli_load_extension:
|
.. _cli_load_extension:
|
||||||
|
|
||||||
Loading SQLite extensions
|
Loading SQLite extensions
|
||||||
|
|
@ -2994,9 +2885,6 @@ Eight (case-insensitive) types are allowed:
|
||||||
* GEOMETRYCOLLECTION
|
* GEOMETRYCOLLECTION
|
||||||
* GEOMETRY
|
* GEOMETRY
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.add_geometry_column() <python_api_gis_add_geometry_column>` CLI reference: :ref:`sqlite-utils add-geometry-column <cli_ref_add_geometry_column>`
|
|
||||||
|
|
||||||
.. _cli_spatialite_indexes:
|
.. _cli_spatialite_indexes:
|
||||||
|
|
||||||
Adding spatial indexes
|
Adding spatial indexes
|
||||||
|
|
@ -3010,9 +2898,6 @@ Once you have a geometry column, you can speed up bounding box queries by adding
|
||||||
|
|
||||||
See this `SpatiaLite Cookbook recipe <http://www.gaia-gis.it/gaia-sins/spatialite-cookbook-5/cookbook_topics.03.html#topic_Wonderful_RTree_Spatial_Index>`__ for examples of how to use a spatial index.
|
See this `SpatiaLite Cookbook recipe <http://www.gaia-gis.it/gaia-sins/spatialite-cookbook-5/cookbook_topics.03.html#topic_Wonderful_RTree_Spatial_Index>`__ for examples of how to use a spatial index.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In Python: :ref:`table.create_spatial_index() <python_api_gis_create_spatial_index>` CLI reference: :ref:`sqlite-utils create-spatial-index <cli_ref_create_spatial_index>`
|
|
||||||
|
|
||||||
.. _cli_install:
|
.. _cli_install:
|
||||||
|
|
||||||
Installing packages
|
Installing packages
|
||||||
|
|
|
||||||
11
docs/conf.py
11
docs/conf.py
|
|
@ -1,7 +1,10 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import inspect
|
import inspect
|
||||||
import sys
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import PIPE, CalledProcessError, Popen, check_output
|
from subprocess import Popen, PIPE, check_output
|
||||||
|
import sys
|
||||||
|
|
||||||
# This file is execfile()d with the current directory set to its
|
# This file is execfile()d with the current directory set to its
|
||||||
# containing dir.
|
# containing dir.
|
||||||
|
|
@ -47,7 +50,7 @@ extlinks = {
|
||||||
def _linkcode_git_ref():
|
def _linkcode_git_ref():
|
||||||
try:
|
try:
|
||||||
return check_output(["git", "rev-parse", "HEAD"]).decode("utf8").strip()
|
return check_output(["git", "rev-parse", "HEAD"]).decode("utf8").strip()
|
||||||
except (CalledProcessError, OSError):
|
except Exception:
|
||||||
return "main"
|
return "main"
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -76,7 +79,7 @@ def linkcode_resolve(domain, info):
|
||||||
obj = inspect.unwrap(obj)
|
obj = inspect.unwrap(obj)
|
||||||
source_file = inspect.getsourcefile(obj)
|
source_file = inspect.getsourcefile(obj)
|
||||||
_, line_number = inspect.getsourcelines(obj)
|
_, line_number = inspect.getsourcelines(obj)
|
||||||
except (OSError, TypeError, ValueError):
|
except Exception:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
if source_file is None:
|
if source_file is None:
|
||||||
|
|
|
||||||
|
|
@ -184,9 +184,6 @@ You can attach an additional database using the ``.attach()`` method, providing
|
||||||
|
|
||||||
You can reference tables in the attached database using the alias value you passed to ``db.attach(alias, filepath)`` as a prefix, for example the ``second.table_in_second`` reference in the SQL query above.
|
You can reference tables in the attached database using the alias value you passed to ``db.attach(alias, filepath)`` as a prefix, for example the ``second.table_in_second`` reference in the SQL query above.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils --attach <cli_query_attach>`
|
|
||||||
|
|
||||||
.. _python_api_tracing:
|
.. _python_api_tracing:
|
||||||
|
|
||||||
Tracing queries
|
Tracing queries
|
||||||
|
|
@ -257,9 +254,6 @@ If a query returns more than one column with the same name - a join between two
|
||||||
|
|
||||||
A suffix that would collide with another column in the query is skipped - ``select 1 as id, 2 as id, 3 as id_2`` returns ``{'id': 1, 'id_3': 2, 'id_2': 3}``. The same renaming is applied by ``table.rows_where()`` and ``table.search()``.
|
A suffix that would collide with another column in the query is skipped - ``select 1 as id, 2 as id, 3 as id_2`` returns ``{'id': 1, 'id_3': 2, 'id_2': 3}``. The same renaming is applied by ``table.rows_where()`` and ``table.search()``.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils query <cli_query>`
|
|
||||||
|
|
||||||
.. _python_api_execute:
|
.. _python_api_execute:
|
||||||
|
|
||||||
db.execute(sql, params)
|
db.execute(sql, params)
|
||||||
|
|
@ -326,15 +320,11 @@ Every method in this library that writes to the database - ``insert()``, ``upser
|
||||||
|
|
||||||
The same applies to raw SQL executed with :ref:`db.execute() <python_api_transactions_execute>` - a write statement is committed as soon as it has run.
|
The same applies to raw SQL executed with :ref:`db.execute() <python_api_transactions_execute>` - a write statement is committed as soon as it has run.
|
||||||
|
|
||||||
Another way to think about this is that each sqlite-utils method call is its own unit of work. If several method calls must either all succeed or all fail, use ``db.atomic()`` to turn them into a single unit of work.
|
|
||||||
|
|
||||||
You never need to call ``commit()``, and you do not need to close the database to persist your changes. There are exactly two situations where you need to think about transactions:
|
You never need to call ``commit()``, and you do not need to close the database to persist your changes. There are exactly two situations where you need to think about transactions:
|
||||||
|
|
||||||
1. You want to group several write operations together, so they either all succeed or all fail - use :ref:`db.atomic() <python_api_atomic>`.
|
1. You want to group several write operations together, so they either all succeed or all fail - use :ref:`db.atomic() <python_api_atomic>`.
|
||||||
2. You are :ref:`managing a transaction yourself <python_api_transactions_manual>` with ``db.begin()``, in which case nothing is committed until you commit - the library will never commit a transaction you opened.
|
2. You are :ref:`managing a transaction yourself <python_api_transactions_manual>` with ``db.begin()``, in which case nothing is committed until you commit - the library will never commit a transaction you opened.
|
||||||
|
|
||||||
``with Database(...) as db:`` is not a transaction block. It manages the lifetime of the database connection and closes it on exit. Use ``with db.atomic():`` for a transaction.
|
|
||||||
|
|
||||||
.. _python_api_atomic:
|
.. _python_api_atomic:
|
||||||
|
|
||||||
Grouping changes with db.atomic()
|
Grouping changes with db.atomic()
|
||||||
|
|
@ -350,27 +340,6 @@ Use ``db.atomic()`` to group multiple operations in a single transaction:
|
||||||
|
|
||||||
The transaction commits when the block exits. If an exception is raised, changes made inside the block will be rolled back.
|
The transaction commits when the block exits. If an exception is raised, changes made inside the block will be rolled back.
|
||||||
|
|
||||||
This matters when several operations represent a single logical change. Without ``db.atomic()``, an earlier method call remains committed if a later one fails:
|
|
||||||
|
|
||||||
.. code-block:: python
|
|
||||||
|
|
||||||
# These are two separate transactions
|
|
||||||
db.table("accounts").update(1, {"balance": 90})
|
|
||||||
db.table("accounts").update(2, {"balance": 110})
|
|
||||||
|
|
||||||
# These updates either both succeed or both fail
|
|
||||||
with db.atomic():
|
|
||||||
db.table("accounts").update(1, {"balance": 90})
|
|
||||||
db.table("accounts").update(2, {"balance": 110})
|
|
||||||
|
|
||||||
Transactions can also improve performance. Calling ``insert()`` repeatedly outside ``db.atomic()`` creates and commits a separate transaction for every call. For bulk inserts, prefer :ref:`insert_all() <python_api_bulk_inserts>`. If you need to call several different methods in a loop, wrap the loop in ``db.atomic()``:
|
|
||||||
|
|
||||||
.. code-block:: python
|
|
||||||
|
|
||||||
with db.atomic():
|
|
||||||
for row in rows:
|
|
||||||
db.table("events").insert(row)
|
|
||||||
|
|
||||||
``db.atomic()`` can be nested. Nested blocks use SQLite savepoints, so an exception in an inner block can roll back to that savepoint without rolling back the entire outer transaction:
|
``db.atomic()`` can be nested. Nested blocks use SQLite savepoints, so an exception in an inner block can roll back to that savepoint without rolling back the entire outer transaction:
|
||||||
|
|
||||||
.. code-block:: python
|
.. code-block:: python
|
||||||
|
|
@ -399,8 +368,6 @@ Write statements executed with :ref:`db.execute() <python_api_execute>` follow t
|
||||||
db.execute("insert into news (headline) values (?)", ["Dog wins award"])
|
db.execute("insert into news (headline) values (?)", ["Dog wins award"])
|
||||||
# Already committed
|
# Already committed
|
||||||
|
|
||||||
``db.execute()`` participates in sqlite-utils transaction handling. Calling ``db.conn.execute()`` directly bypasses that policy and leaves transaction handling to Python's underlying ``sqlite3.Connection``. Prefer ``db.execute()`` unless you deliberately need the lower-level API.
|
|
||||||
|
|
||||||
If a transaction is open - because the call happens inside a ``db.atomic()`` block, or after ``db.begin()`` - the statement becomes part of that transaction instead, and commits when the transaction commits:
|
If a transaction is open - because the call happens inside a ``db.atomic()`` block, or after ``db.begin()`` - the statement becomes part of that transaction instead, and commits when the transaction commits:
|
||||||
|
|
||||||
.. code-block:: python
|
.. code-block:: python
|
||||||
|
|
@ -432,12 +399,9 @@ You can take full manual control using the ``db.begin()``, ``db.commit()`` and `
|
||||||
|
|
||||||
The library will never commit a transaction you opened. If you call write methods such as ``insert()`` - or use ``db.atomic()`` - while your transaction is open, they participate in it using SQLite savepoints instead of committing: exiting an ``atomic()`` block releases its savepoint, but nothing is saved to disk until you commit the outer transaction yourself. If you roll back, their changes are rolled back too.
|
The library will never commit a transaction you opened. If you call write methods such as ``insert()`` - or use ``db.atomic()`` - while your transaction is open, they participate in it using SQLite savepoints instead of committing: exiting an ``atomic()`` block releases its savepoint, but nothing is saved to disk until you commit the outer transaction yourself. If you roll back, their changes are rolled back too.
|
||||||
|
|
||||||
Prefer ``db.atomic()`` or ``db.begin()``, ``db.commit()`` and ``db.rollback()`` over mixing sqlite-utils transaction methods with calls to ``db.conn.commit()``, ``db.conn.rollback()`` or raw transaction-control SQL. Mixing the two layers makes it much harder to tell which layer owns the current transaction.
|
Two related safeguards to be aware of:
|
||||||
|
|
||||||
Some related safeguards to be aware of:
|
|
||||||
|
|
||||||
- ``db.enable_wal()`` and ``db.disable_wal()`` raise a ``sqlite_utils.db.TransactionError`` if called while a transaction is open, because changing the journal mode would commit it as a side effect.
|
- ``db.enable_wal()`` and ``db.disable_wal()`` raise a ``sqlite_utils.db.TransactionError`` if called while a transaction is open, because changing the journal mode would commit it as a side effect.
|
||||||
- ``table.transform()`` raises a ``sqlite_utils.db.TransactionError`` if called while a transaction is open with ``PRAGMA foreign_keys`` enabled and the table is referenced by foreign keys with destructive ``ON DELETE`` actions, because the pragma cannot be turned off mid-transaction to protect those referencing rows - see :ref:`python_api_transform_foreign_keys_transactions`.
|
|
||||||
- Closing the database - explicitly with ``db.close()``, or by exiting a ``with Database(...) as db:`` block - rolls back any transaction that is still open, see :ref:`python_api_close`.
|
- Closing the database - explicitly with ``db.close()``, or by exiting a ``with Database(...) as db:`` block - rolls back any transaction that is still open, see :ref:`python_api_close`.
|
||||||
|
|
||||||
.. _python_api_transactions_modes:
|
.. _python_api_transactions_modes:
|
||||||
|
|
@ -445,11 +409,9 @@ Some related safeguards to be aware of:
|
||||||
Supported connection modes
|
Supported connection modes
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
||||||
``db.atomic()`` and the automatic per-method transactions currently require a connection using Python's legacy transaction control mode (``sqlite3.LEGACY_TRANSACTION_CONTROL`` on Python 3.12 and later). Passing a connection created with the Python 3.12+ ``sqlite3.connect(..., autocommit=True)`` or ``autocommit=False`` options to ``Database()`` raises a ``sqlite_utils.db.TransactionError``.
|
``db.atomic()`` and the automatic per-method transactions require a connection in Python's default transaction handling mode. Passing a connection created with the Python 3.12+ ``sqlite3.connect(..., autocommit=True)`` or ``autocommit=False`` options to ``Database()`` raises a ``sqlite_utils.db.TransactionError``.
|
||||||
|
|
||||||
Connections using ``autocommit=False`` are not supported because Python keeps a transaction open continuously. sqlite-utils uses ``Connection.in_transaction`` to distinguish its own transactions from transactions opened by its caller, and that distinction is not available in this mode.
|
This is because ``commit()`` and ``rollback()`` behave differently on those connections - under ``autocommit=True`` they are documented no-ops - which would cause every write made by this library to be silently discarded when the connection closed, rather than failing loudly.
|
||||||
|
|
||||||
Connections using ``autocommit=True`` are also currently rejected because sqlite-utils has not formally exposed that as a supported configuration.
|
|
||||||
|
|
||||||
.. _python_api_table:
|
.. _python_api_table:
|
||||||
|
|
||||||
|
|
@ -504,9 +466,6 @@ You can also iterate through the table objects themselves using the ``.tables``
|
||||||
>>> db.tables
|
>>> db.tables
|
||||||
[<Table dogs>]
|
[<Table dogs>]
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils tables <cli_tables>`
|
|
||||||
|
|
||||||
.. _python_api_views:
|
.. _python_api_views:
|
||||||
|
|
||||||
Listing views
|
Listing views
|
||||||
|
|
@ -532,9 +491,6 @@ View objects are similar to Table objects, except that any attempts to insert or
|
||||||
* ``rows_where(where, where_args, order_by, select)``
|
* ``rows_where(where, where_args, order_by, select)``
|
||||||
* ``drop()``
|
* ``drop()``
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils views <cli_views>`
|
|
||||||
|
|
||||||
.. _python_api_rows:
|
.. _python_api_rows:
|
||||||
|
|
||||||
Listing rows
|
Listing rows
|
||||||
|
|
@ -590,9 +546,6 @@ This method also accepts ``offset=`` and ``limit=`` arguments, for specifying an
|
||||||
... print(row)
|
... print(row)
|
||||||
{'id': 1, 'age': 4, 'name': 'Cleo'}
|
{'id': 1, 'age': 4, 'name': 'Cleo'}
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils rows <cli_rows>`
|
|
||||||
|
|
||||||
.. _python_api_rows_count_where:
|
.. _python_api_rows_count_where:
|
||||||
|
|
||||||
Counting rows
|
Counting rows
|
||||||
|
|
@ -677,9 +630,6 @@ The ``db.schema`` property returns the full SQL schema for the database as a str
|
||||||
"name" TEXT
|
"name" TEXT
|
||||||
);
|
);
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils schema <cli_schema>`
|
|
||||||
|
|
||||||
.. _python_api_creating_tables:
|
.. _python_api_creating_tables:
|
||||||
|
|
||||||
Creating tables
|
Creating tables
|
||||||
|
|
@ -828,9 +778,6 @@ You can pass ``strict=True`` to create a table in ``STRICT`` mode:
|
||||||
"name": str,
|
"name": str,
|
||||||
}, strict=True)
|
}, strict=True)
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils create-table <cli_create_table>`
|
|
||||||
|
|
||||||
.. _python_api_compound_primary_keys:
|
.. _python_api_compound_primary_keys:
|
||||||
|
|
||||||
Compound primary keys
|
Compound primary keys
|
||||||
|
|
@ -1011,9 +958,6 @@ Here's an example that uses these features:
|
||||||
# )
|
# )
|
||||||
|
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils insert --not-null and --default <cli_defaults_not_null>`
|
|
||||||
|
|
||||||
.. _python_api_rename_table:
|
.. _python_api_rename_table:
|
||||||
|
|
||||||
Renaming a table
|
Renaming a table
|
||||||
|
|
@ -1031,9 +975,6 @@ This executes the following SQL:
|
||||||
|
|
||||||
ALTER TABLE [my_table] RENAME TO [new_name_for_my_table]
|
ALTER TABLE [my_table] RENAME TO [new_name_for_my_table]
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils rename-table <cli_renaming_tables>`
|
|
||||||
|
|
||||||
.. _python_api_duplicate:
|
.. _python_api_duplicate:
|
||||||
|
|
||||||
Duplicating tables
|
Duplicating tables
|
||||||
|
|
@ -1049,9 +990,6 @@ The new ``authors_copy`` table will now contain a duplicate copy of the data fro
|
||||||
|
|
||||||
This method raises ``sqlite_utils.db.NoTable`` if the table does not exist.
|
This method raises ``sqlite_utils.db.NoTable`` if the table does not exist.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils duplicate <cli_duplicate_table>`
|
|
||||||
|
|
||||||
.. _python_api_bulk_inserts:
|
.. _python_api_bulk_inserts:
|
||||||
|
|
||||||
Bulk inserts
|
Bulk inserts
|
||||||
|
|
@ -1094,9 +1032,6 @@ You can delete all the existing rows in the table before inserting the new recor
|
||||||
|
|
||||||
Pass ``analyze=True`` to run ``ANALYZE`` against the table after inserting the new records.
|
Pass ``analyze=True`` to run ``ANALYZE`` against the table after inserting the new records.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils insert <cli_inserting_data>`
|
|
||||||
|
|
||||||
.. _python_api_insert_lists:
|
.. _python_api_insert_lists:
|
||||||
|
|
||||||
Inserting data from a list or tuple iterator
|
Inserting data from a list or tuple iterator
|
||||||
|
|
@ -1174,9 +1109,6 @@ To replace any existing records that have a matching primary key, use the ``repl
|
||||||
.. note::
|
.. note::
|
||||||
Prior to sqlite-utils 2.0 the ``.upsert()`` and ``.upsert_all()`` methods worked the same way as ``.insert(replace=True)`` does today. See :ref:`python_api_upsert` for the new behaviour of those methods introduced in 2.0.
|
Prior to sqlite-utils 2.0 the ``.upsert()`` and ``.upsert_all()`` methods worked the same way as ``.insert(replace=True)`` does today. See :ref:`python_api_upsert` for the new behaviour of those methods introduced in 2.0.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils insert --replace <cli_insert_replace>`
|
|
||||||
|
|
||||||
.. _python_api_update:
|
.. _python_api_update:
|
||||||
|
|
||||||
Updating a specific record
|
Updating a specific record
|
||||||
|
|
@ -1262,9 +1194,6 @@ Every record passed to ``upsert()`` or ``upsert_all()`` must include a value for
|
||||||
.. note::
|
.. note::
|
||||||
``.upsert()`` and ``.upsert_all()`` in sqlite-utils 1.x worked like ``.insert(..., replace=True)`` and ``.insert_all(..., replace=True)`` do in 2.x. See `issue #66 <https://github.com/simonw/sqlite-utils/issues/66>`__ for details of this change.
|
``.upsert()`` and ``.upsert_all()`` in sqlite-utils 1.x worked like ``.insert(..., replace=True)`` and ``.insert_all(..., replace=True)`` do in 2.x. See `issue #66 <https://github.com/simonw/sqlite-utils/issues/66>`__ for details of this change.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils upsert <cli_upsert>`
|
|
||||||
|
|
||||||
.. _python_api_old_upsert:
|
.. _python_api_old_upsert:
|
||||||
|
|
||||||
Alternative upserts using INSERT OR IGNORE
|
Alternative upserts using INSERT OR IGNORE
|
||||||
|
|
@ -1616,9 +1545,6 @@ You can set a ``NOT NULL DEFAULT 'x'`` constraint on the new column using ``not_
|
||||||
|
|
||||||
db.table("dogs").add_column("friends_count", int, not_null_default=0)
|
db.table("dogs").add_column("friends_count", int, not_null_default=0)
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils add-column <cli_add_column>`
|
|
||||||
|
|
||||||
.. _python_api_add_column_alter:
|
.. _python_api_add_column_alter:
|
||||||
|
|
||||||
Adding columns automatically on insert/update
|
Adding columns automatically on insert/update
|
||||||
|
|
@ -1642,9 +1568,6 @@ You can insert or update data that includes new columns and have the table autom
|
||||||
new_table = db.table("new_table", alter=True)
|
new_table = db.table("new_table", alter=True)
|
||||||
new_table.insert({"name": "Gareth", "age": 32, "shoe_size": 11})
|
new_table.insert({"name": "Gareth", "age": 32, "shoe_size": 11})
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils insert --alter <cli_add_column_alter>`
|
|
||||||
|
|
||||||
.. _python_api_add_foreign_key:
|
.. _python_api_add_foreign_key:
|
||||||
|
|
||||||
Adding foreign key constraints
|
Adding foreign key constraints
|
||||||
|
|
@ -1703,9 +1626,6 @@ Use ``on_delete=`` and ``on_update=`` to specify ``ON DELETE`` and ``ON UPDATE``
|
||||||
|
|
||||||
This creates a foreign key with an ``ON DELETE CASCADE`` clause, so deleting an author will also delete their books (provided foreign key enforcement is enabled with ``PRAGMA foreign_keys = ON``). Valid actions are ``"SET NULL"``, ``"SET DEFAULT"``, ``"CASCADE"``, ``"RESTRICT"`` and the default ``"NO ACTION"``.
|
This creates a foreign key with an ``ON DELETE CASCADE`` clause, so deleting an author will also delete their books (provided foreign key enforcement is enabled with ``PRAGMA foreign_keys = ON``). Valid actions are ``"SET NULL"``, ``"SET DEFAULT"``, ``"CASCADE"``, ``"RESTRICT"`` and the default ``"NO ACTION"``.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils add-foreign-key <cli_add_foreign_key>`
|
|
||||||
|
|
||||||
.. _python_api_add_foreign_keys:
|
.. _python_api_add_foreign_keys:
|
||||||
|
|
||||||
Adding multiple foreign key constraints at once
|
Adding multiple foreign key constraints at once
|
||||||
|
|
@ -1726,9 +1646,6 @@ This method runs the same checks as ``.add_foreign_keys()`` and will raise ``sql
|
||||||
|
|
||||||
Foreign keys that already exist are silently skipped, so repeated calls are idempotent - but only if they match exactly. Requesting a foreign key that exists with different ``ON DELETE``/``ON UPDATE`` actions raises ``AlterError``: use ``table.transform()`` to change the actions of an existing foreign key.
|
Foreign keys that already exist are silently skipped, so repeated calls are idempotent - but only if they match exactly. Requesting a foreign key that exists with different ``ON DELETE``/``ON UPDATE`` actions raises ``AlterError``: use ``table.transform()`` to change the actions of an existing foreign key.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils add-foreign-keys <cli_add_foreign_keys>`
|
|
||||||
|
|
||||||
.. _python_api_index_foreign_keys:
|
.. _python_api_index_foreign_keys:
|
||||||
|
|
||||||
Adding indexes for all foreign keys
|
Adding indexes for all foreign keys
|
||||||
|
|
@ -1742,9 +1659,6 @@ If you want to ensure that every foreign key column in your database has a corre
|
||||||
|
|
||||||
Compound foreign keys get a single composite index across their columns.
|
Compound foreign keys get a single composite index across their columns.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils index-foreign-keys <cli_index_foreign_keys>`
|
|
||||||
|
|
||||||
.. _python_api_drop:
|
.. _python_api_drop:
|
||||||
|
|
||||||
Dropping a table or view
|
Dropping a table or view
|
||||||
|
|
@ -1766,9 +1680,6 @@ Pass ``ignore=True`` if you want to ignore the error caused by the table or view
|
||||||
|
|
||||||
db.table("my_table").drop(ignore=True)
|
db.table("my_table").drop(ignore=True)
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils drop-table <cli_drop_table>` and :ref:`sqlite-utils drop-view <cli_drop_view>`
|
|
||||||
|
|
||||||
.. _python_api_transform:
|
.. _python_api_transform:
|
||||||
|
|
||||||
Transforming a table
|
Transforming a table
|
||||||
|
|
@ -1797,9 +1708,6 @@ To keep the original table around instead of dropping it, pass the ``keep_table=
|
||||||
|
|
||||||
This method raises a ``sqlite_utils.db.TransformError`` exception if the table cannot be transformed, usually because there are existing constraints or indexes that are incompatible with modifications to the columns.
|
This method raises a ``sqlite_utils.db.TransformError`` exception if the table cannot be transformed, usually because there are existing constraints or indexes that are incompatible with modifications to the columns.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils transform <cli_transform_table>`
|
|
||||||
|
|
||||||
.. _python_api_transform_alter_column_types:
|
.. _python_api_transform_alter_column_types:
|
||||||
|
|
||||||
Altering column types
|
Altering column types
|
||||||
|
|
@ -1814,29 +1722,6 @@ To alter the type of a column, use the ``types=`` argument:
|
||||||
|
|
||||||
See :ref:`python_api_add_column` for a list of available types.
|
See :ref:`python_api_add_column` for a list of available types.
|
||||||
|
|
||||||
.. _python_api_transform_strict:
|
|
||||||
|
|
||||||
Changing strict mode
|
|
||||||
--------------------
|
|
||||||
|
|
||||||
The optional ``strict=`` parameter can change whether a table uses `SQLite STRICT mode <https://www.sqlite.org/stricttables.html>`__. Pass ``strict=True`` to convert a regular table to a strict table:
|
|
||||||
|
|
||||||
.. code-block:: python
|
|
||||||
|
|
||||||
table.transform(strict=True)
|
|
||||||
|
|
||||||
Pass ``strict=False`` to convert a strict table back to a regular non-strict table:
|
|
||||||
|
|
||||||
.. code-block:: python
|
|
||||||
|
|
||||||
table.transform(strict=False)
|
|
||||||
|
|
||||||
The default is ``strict=None``, which preserves the table's existing strict mode.
|
|
||||||
|
|
||||||
Passing ``strict=True`` raises ``sqlite_utils.db.TransformError`` if the available SQLite version does not support strict tables.
|
|
||||||
|
|
||||||
Converting to a strict table validates all existing rows as they are copied into the replacement table. If a value is incompatible with its declared column type, SQLite raises ``sqlite3.IntegrityError`` and the transformation is rolled back, leaving the original table and its data unchanged.
|
|
||||||
|
|
||||||
.. _python_api_transform_rename_columns:
|
.. _python_api_transform_rename_columns:
|
||||||
|
|
||||||
Renaming columns
|
Renaming columns
|
||||||
|
|
@ -1997,36 +1882,6 @@ If you want to do something more advanced, you can call the ``table.transform_sq
|
||||||
|
|
||||||
This method will return a list of SQL statements that should be executed to implement the change. You can then make modifications to that SQL - or add additional SQL statements - before executing it yourself.
|
This method will return a list of SQL statements that should be executed to implement the change. You can then make modifications to that SQL - or add additional SQL statements - before executing it yourself.
|
||||||
|
|
||||||
.. _python_api_transform_foreign_keys_transactions:
|
|
||||||
|
|
||||||
Foreign keys and transactions
|
|
||||||
-----------------------------
|
|
||||||
|
|
||||||
Because ``.transform()`` drops the old table, running it with ``PRAGMA foreign_keys`` enabled could fire ``ON DELETE`` actions on any tables that reference it - an inbound ``ON DELETE CASCADE`` foreign key would silently delete those referencing rows. To prevent this, ``.transform()`` turns ``PRAGMA foreign_keys`` off for the duration of the operation and restores it afterwards, running ``PRAGMA foreign_key_check`` before committing.
|
|
||||||
|
|
||||||
``PRAGMA foreign_keys`` cannot be changed inside a transaction, so this protection is impossible if you call ``.transform()`` while a transaction is already open - for example inside a ``with db.atomic():`` block or after ``db.begin()``. If ``PRAGMA foreign_keys`` is on and another table references the table being transformed with a destructive ``ON DELETE`` action - ``CASCADE``, ``SET NULL`` or ``SET DEFAULT`` - the method will refuse to run and raise a ``sqlite_utils.db.TransactionError``:
|
|
||||||
|
|
||||||
.. code-block:: python
|
|
||||||
|
|
||||||
from sqlite_utils.db import TransactionError
|
|
||||||
|
|
||||||
try:
|
|
||||||
with db.atomic():
|
|
||||||
db["authors"].transform(types={"id": str})
|
|
||||||
except TransactionError as ex:
|
|
||||||
print("Could not transform in transaction:", ex)
|
|
||||||
|
|
||||||
To transform such a table either call ``.transform()`` outside of the transaction, or execute ``PRAGMA foreign_keys = off`` before opening it:
|
|
||||||
|
|
||||||
.. code-block:: python
|
|
||||||
|
|
||||||
db.execute("PRAGMA foreign_keys = off")
|
|
||||||
with db.atomic():
|
|
||||||
db["authors"].transform(types={"id": str})
|
|
||||||
db.execute("PRAGMA foreign_keys = on")
|
|
||||||
|
|
||||||
Tables referenced by foreign keys without a destructive action (the default ``NO ACTION``, or ``RESTRICT``) can still be transformed inside a transaction - sqlite-utils uses ``PRAGMA defer_foreign_keys`` to postpone the foreign key checks until the transaction commits.
|
|
||||||
|
|
||||||
.. _python_api_extract:
|
.. _python_api_extract:
|
||||||
|
|
||||||
Extracting columns into a separate table
|
Extracting columns into a separate table
|
||||||
|
|
@ -2185,9 +2040,6 @@ This produces a lookup table like so:
|
||||||
|
|
||||||
Rows where every extracted column is ``null`` are not extracted: no record is created for them in the lookup table and their foreign key column is left as ``null``. When extracting multiple columns, rows where at least one of the extracted columns has a value will be extracted as usual.
|
Rows where every extracted column is ``null`` are not extracted: no record is created for them in the lookup table and their foreign key column is left as ``null``. When extracting multiple columns, rows where at least one of the extracted columns has a value will be extracted as usual.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils extract <cli_extract>`
|
|
||||||
|
|
||||||
.. _python_api_hash:
|
.. _python_api_hash:
|
||||||
|
|
||||||
Setting an ID based on the hash of the row contents
|
Setting an ID based on the hash of the row contents
|
||||||
|
|
@ -2249,9 +2101,6 @@ You can pass ``ignore=True`` to silently ignore an existing view and do nothing,
|
||||||
select * from dogs where is_good_dog = 1
|
select * from dogs where is_good_dog = 1
|
||||||
""", replace=True)
|
""", replace=True)
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils create-view <cli_create_view>`
|
|
||||||
|
|
||||||
Storing JSON
|
Storing JSON
|
||||||
============
|
============
|
||||||
|
|
||||||
|
|
@ -2370,9 +2219,6 @@ If you are using ``pysqlite3`` the underlying method may be missing. If you inst
|
||||||
|
|
||||||
pip install sqlite-dump
|
pip install sqlite-dump
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils dump <cli_dump>`
|
|
||||||
|
|
||||||
.. _python_api_introspection:
|
.. _python_api_introspection:
|
||||||
|
|
||||||
Introspecting tables and views
|
Introspecting tables and views
|
||||||
|
|
@ -2572,9 +2418,6 @@ The ``.indexes`` property returns all indexes created for a table, as a list of
|
||||||
Index(seq=4, name='"Street_Tree_List_qCaretaker"', unique=0, origin='c', partial=0, columns=['qCaretaker']),
|
Index(seq=4, name='"Street_Tree_List_qCaretaker"', unique=0, origin='c', partial=0, columns=['qCaretaker']),
|
||||||
Index(seq=5, name='"Street_Tree_List_PlantType"', unique=0, origin='c', partial=0, columns=['PlantType'])]
|
Index(seq=5, name='"Street_Tree_List_PlantType"', unique=0, origin='c', partial=0, columns=['PlantType'])]
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils indexes <cli_indexes>`
|
|
||||||
|
|
||||||
.. _python_api_introspection_xindexes:
|
.. _python_api_introspection_xindexes:
|
||||||
|
|
||||||
.xindexes
|
.xindexes
|
||||||
|
|
@ -2618,9 +2461,6 @@ The ``.triggers`` property lists database triggers. It can be used on both datab
|
||||||
>>> db.triggers
|
>>> db.triggers
|
||||||
... similar output to db.table("authors").triggers
|
... similar output to db.table("authors").triggers
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils triggers <cli_triggers>`
|
|
||||||
|
|
||||||
.. _python_api_introspection_triggers_dict:
|
.. _python_api_introspection_triggers_dict:
|
||||||
|
|
||||||
.triggers_dict
|
.triggers_dict
|
||||||
|
|
@ -2769,9 +2609,6 @@ To remove the FTS tables and triggers you created, use the ``disable_fts()`` tab
|
||||||
|
|
||||||
db.table("dogs").disable_fts()
|
db.table("dogs").disable_fts()
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils enable-fts <cli_fts>`
|
|
||||||
|
|
||||||
.. _python_api_quote_fts:
|
.. _python_api_quote_fts:
|
||||||
|
|
||||||
Quoting characters for use in search
|
Quoting characters for use in search
|
||||||
|
|
@ -2836,9 +2673,6 @@ To return just the title and published columns for three matches for ``"dog"`` w
|
||||||
):
|
):
|
||||||
print(article)
|
print(article)
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils search <cli_search>`
|
|
||||||
|
|
||||||
.. _python_api_fts_search_sql:
|
.. _python_api_fts_search_sql:
|
||||||
|
|
||||||
Building SQL queries with table.search_sql()
|
Building SQL queries with table.search_sql()
|
||||||
|
|
@ -2923,9 +2757,6 @@ This runs the following SQL::
|
||||||
|
|
||||||
INSERT INTO dogs_fts (dogs_fts) VALUES ("rebuild");
|
INSERT INTO dogs_fts (dogs_fts) VALUES ("rebuild");
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils rebuild-fts <cli_fts>`
|
|
||||||
|
|
||||||
.. _python_api_fts_optimize:
|
.. _python_api_fts_optimize:
|
||||||
|
|
||||||
Optimizing a full-text search table
|
Optimizing a full-text search table
|
||||||
|
|
@ -2941,9 +2772,6 @@ This runs the following SQL::
|
||||||
|
|
||||||
INSERT INTO dogs_fts (dogs_fts) VALUES ("optimize");
|
INSERT INTO dogs_fts (dogs_fts) VALUES ("optimize");
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils optimize <cli_optimize>`
|
|
||||||
|
|
||||||
.. _python_api_cached_table_counts:
|
.. _python_api_cached_table_counts:
|
||||||
|
|
||||||
Cached table counts using triggers
|
Cached table counts using triggers
|
||||||
|
|
@ -3006,9 +2834,6 @@ If the ``_counts`` table ever becomes out-of-sync with the actual table counts y
|
||||||
|
|
||||||
db.reset_counts()
|
db.reset_counts()
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils enable-counts <cli_enable_counts>`
|
|
||||||
|
|
||||||
.. _python_api_create_index:
|
.. _python_api_create_index:
|
||||||
|
|
||||||
Creating indexes
|
Creating indexes
|
||||||
|
|
@ -3052,17 +2877,6 @@ Use ``if_not_exists=True`` to do nothing if an index with that name already exis
|
||||||
|
|
||||||
Pass ``analyze=True`` to run ``ANALYZE`` against the new index after creating it.
|
Pass ``analyze=True`` to run ``ANALYZE`` against the new index after creating it.
|
||||||
|
|
||||||
You can drop an index from a table using ``.drop_index(index_name)``:
|
|
||||||
|
|
||||||
.. code-block:: python
|
|
||||||
|
|
||||||
db.table("dogs").drop_index("idx_dogs_name")
|
|
||||||
|
|
||||||
Use ``ignore=True`` to ignore the error if the index does not exist.
|
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils create-index <cli_create_index>` and :ref:`sqlite-utils drop-index <cli_drop_index>`
|
|
||||||
|
|
||||||
.. _python_api_analyze:
|
.. _python_api_analyze:
|
||||||
|
|
||||||
Optimizing index usage with ANALYZE
|
Optimizing index usage with ANALYZE
|
||||||
|
|
@ -3090,9 +2904,6 @@ To run against all indexes attached to a specific table, you can either pass the
|
||||||
|
|
||||||
db.table("dogs").analyze()
|
db.table("dogs").analyze()
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils analyze <cli_analyze>`
|
|
||||||
|
|
||||||
.. _python_api_vacuum:
|
.. _python_api_vacuum:
|
||||||
|
|
||||||
Vacuum
|
Vacuum
|
||||||
|
|
@ -3104,9 +2915,6 @@ You can optimize your database by running VACUUM against it like so:
|
||||||
|
|
||||||
Database("my_database.db").vacuum()
|
Database("my_database.db").vacuum()
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils vacuum <cli_vacuum>`
|
|
||||||
|
|
||||||
.. _python_api_wal:
|
.. _python_api_wal:
|
||||||
|
|
||||||
WAL mode
|
WAL mode
|
||||||
|
|
@ -3134,9 +2942,6 @@ You can check the current journal mode for a database using the ``journal_mode``
|
||||||
|
|
||||||
This will usually be ``wal`` or ``delete`` (meaning WAL is disabled), but can have other values - see the `PRAGMA journal_mode <https://www.sqlite.org/pragma.html#pragma_journal_mode>`__ documentation.
|
This will usually be ``wal`` or ``delete`` (meaning WAL is disabled), but can have other values - see the `PRAGMA journal_mode <https://www.sqlite.org/pragma.html#pragma_journal_mode>`__ documentation.
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils enable-wal and disable-wal <cli_wal>`
|
|
||||||
|
|
||||||
.. _python_api_suggest_column_types:
|
.. _python_api_suggest_column_types:
|
||||||
|
|
||||||
Suggesting column types
|
Suggesting column types
|
||||||
|
|
@ -3277,9 +3082,6 @@ You can cause ``sqlite3`` to return more useful errors, including the traceback
|
||||||
|
|
||||||
sqlite3.enable_callback_tracebacks(True)
|
sqlite3.enable_callback_tracebacks(True)
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils query --functions <cli_query_functions>`
|
|
||||||
|
|
||||||
.. _python_api_quote:
|
.. _python_api_quote:
|
||||||
|
|
||||||
Quoting strings for use in SQL
|
Quoting strings for use in SQL
|
||||||
|
|
@ -3412,9 +3214,6 @@ Initialize SpatiaLite
|
||||||
.. automethod:: sqlite_utils.db.Database.init_spatialite
|
.. automethod:: sqlite_utils.db.Database.init_spatialite
|
||||||
:noindex:
|
:noindex:
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils create-database --init-spatialite <cli_create_database>`
|
|
||||||
|
|
||||||
.. _python_api_gis_find_spatialite:
|
.. _python_api_gis_find_spatialite:
|
||||||
|
|
||||||
Finding SpatiaLite
|
Finding SpatiaLite
|
||||||
|
|
@ -3430,9 +3229,6 @@ Adding geometry columns
|
||||||
.. automethod:: sqlite_utils.db.Table.add_geometry_column
|
.. automethod:: sqlite_utils.db.Table.add_geometry_column
|
||||||
:noindex:
|
:noindex:
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils add-geometry-column <cli_spatialite>`
|
|
||||||
|
|
||||||
.. _python_api_gis_create_spatial_index:
|
.. _python_api_gis_create_spatial_index:
|
||||||
|
|
||||||
Creating a spatial index
|
Creating a spatial index
|
||||||
|
|
@ -3440,6 +3236,3 @@ Creating a spatial index
|
||||||
|
|
||||||
.. automethod:: sqlite_utils.db.Table.create_spatial_index
|
.. automethod:: sqlite_utils.db.Table.create_spatial_index
|
||||||
:noindex:
|
:noindex:
|
||||||
|
|
||||||
.. note::
|
|
||||||
In the CLI: :ref:`sqlite-utils create-spatial-index <cli_spatialite_indexes>`
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[project]
|
[project]
|
||||||
name = "sqlite-utils"
|
name = "sqlite-utils"
|
||||||
version = "4.1.1"
|
version = "4.0"
|
||||||
description = "CLI tool and Python library for manipulating SQLite databases"
|
description = "CLI tool and Python library for manipulating SQLite databases"
|
||||||
readme = { file = "README.md", content-type = "text/markdown" }
|
readme = { file = "README.md", content-type = "text/markdown" }
|
||||||
authors = [
|
authors = [
|
||||||
|
|
@ -79,14 +79,7 @@ build-backend = "setuptools.build_meta"
|
||||||
max-line-length = 160
|
max-line-length = 160
|
||||||
# Black compatibility, E203 whitespace before ':':
|
# Black compatibility, E203 whitespace before ':':
|
||||||
extend-ignore = ["E203"]
|
extend-ignore = ["E203"]
|
||||||
extend-exclude = [
|
extend-exclude = [".venv", "build", "dist", "docs", "sqlite_utils.egg-info"]
|
||||||
".venv",
|
|
||||||
".claude",
|
|
||||||
"build",
|
|
||||||
"dist",
|
|
||||||
"docs",
|
|
||||||
"sqlite_utils.egg-info",
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.setuptools.package-data]
|
[tool.setuptools.package-data]
|
||||||
sqlite_utils = ["py.typed"]
|
sqlite_utils = ["py.typed"]
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
from .db import Database
|
|
||||||
from .hookspecs import hookimpl, hookspec
|
|
||||||
from .migrations import Migrations
|
|
||||||
from .utils import suggest_column_types
|
from .utils import suggest_column_types
|
||||||
|
from .hookspecs import hookimpl
|
||||||
|
from .hookspecs import hookspec
|
||||||
|
from .db import Database
|
||||||
|
from .migrations import Migrations
|
||||||
|
|
||||||
__all__ = ["Database", "Migrations", "hookimpl", "hookspec", "suggest_column_types"]
|
__all__ = ["Database", "Migrations", "suggest_column_types", "hookimpl", "hookspec"]
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,17 @@
|
||||||
import base64
|
import base64
|
||||||
import csv as csv_std
|
|
||||||
import difflib
|
import difflib
|
||||||
import hashlib
|
|
||||||
import inspect
|
|
||||||
import io
|
|
||||||
import itertools
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import pathlib
|
|
||||||
import pdb # noqa: T100
|
|
||||||
import sys
|
|
||||||
import textwrap
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
from runpy import run_module
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
import click
|
import click
|
||||||
import tabulate
|
|
||||||
from click_default_group import DefaultGroup
|
from click_default_group import DefaultGroup
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
import hashlib
|
||||||
|
import pathlib
|
||||||
|
from runpy import run_module
|
||||||
import sqlite_utils
|
import sqlite_utils
|
||||||
from sqlite_utils import recipes
|
|
||||||
from sqlite_utils.db import (
|
from sqlite_utils.db import (
|
||||||
DEFAULT,
|
|
||||||
AlterError,
|
AlterError,
|
||||||
BadMultiValues,
|
BadMultiValues,
|
||||||
|
DEFAULT,
|
||||||
DescIndex,
|
DescIndex,
|
||||||
InvalidColumns,
|
InvalidColumns,
|
||||||
NoTable,
|
NoTable,
|
||||||
|
|
@ -32,28 +19,36 @@ from sqlite_utils.db import (
|
||||||
PrimaryKeyRequired,
|
PrimaryKeyRequired,
|
||||||
quote_identifier,
|
quote_identifier,
|
||||||
)
|
)
|
||||||
from sqlite_utils.plugins import ensure_plugins_loaded, get_plugins, pm
|
from sqlite_utils.plugins import ensure_plugins_loaded, pm, get_plugins
|
||||||
from sqlite_utils.utils import maximize_csv_field_size_limit
|
from sqlite_utils.utils import maximize_csv_field_size_limit
|
||||||
|
from sqlite_utils import recipes
|
||||||
|
import textwrap
|
||||||
|
import inspect
|
||||||
|
import io
|
||||||
|
import itertools
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import pdb
|
||||||
|
import sys
|
||||||
|
import csv as csv_std
|
||||||
|
import tabulate
|
||||||
from .utils import (
|
from .utils import (
|
||||||
Format,
|
|
||||||
OperationalError,
|
OperationalError,
|
||||||
TypeTracker,
|
|
||||||
_compile_code,
|
_compile_code,
|
||||||
chunks,
|
chunks,
|
||||||
decode_base64_values,
|
|
||||||
dedupe_keys,
|
dedupe_keys,
|
||||||
file_progress,
|
file_progress,
|
||||||
find_spatialite,
|
find_spatialite,
|
||||||
|
flatten as _flatten,
|
||||||
|
sqlite3,
|
||||||
|
decode_base64_values,
|
||||||
progressbar,
|
progressbar,
|
||||||
rows_from_file,
|
rows_from_file,
|
||||||
sqlite3,
|
Format,
|
||||||
)
|
TypeTracker,
|
||||||
from .utils import (
|
|
||||||
flatten as _flatten,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
CONTEXT_SETTINGS = {"help_option_names": ["-h", "--help"]}
|
CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
|
||||||
|
|
||||||
|
|
||||||
def _register_db_for_cleanup(db):
|
def _register_db_for_cleanup(db):
|
||||||
|
|
@ -72,7 +67,7 @@ def _close_databases(ctx):
|
||||||
for db in ctx.meta.get("_databases_to_close", []):
|
for db in ctx.meta.get("_databases_to_close", []):
|
||||||
try:
|
try:
|
||||||
db.close()
|
db.close()
|
||||||
except sqlite3.Error:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -179,6 +174,7 @@ def functions_option(fn):
|
||||||
@click.version_option()
|
@click.version_option()
|
||||||
def cli():
|
def cli():
|
||||||
"Commands for interacting with a SQLite database"
|
"Commands for interacting with a SQLite database"
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
@cli.command()
|
@cli.command()
|
||||||
|
|
@ -696,34 +692,6 @@ def create_index(
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@cli.command(name="drop-index")
|
|
||||||
@click.argument(
|
|
||||||
"path",
|
|
||||||
type=click.Path(exists=True, file_okay=True, dir_okay=False, allow_dash=False),
|
|
||||||
required=True,
|
|
||||||
)
|
|
||||||
@click.argument("table")
|
|
||||||
@click.argument("index")
|
|
||||||
@click.option("--ignore", help="Ignore if index does not exist", is_flag=True)
|
|
||||||
@load_extension_option
|
|
||||||
def drop_index(path, table, index, ignore, load_extension):
|
|
||||||
"""
|
|
||||||
Drop an index by index name from the specified table
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
\b
|
|
||||||
sqlite-utils drop-index chickens.db chickens idx_chickens_name
|
|
||||||
"""
|
|
||||||
db = sqlite_utils.Database(path)
|
|
||||||
_register_db_for_cleanup(db)
|
|
||||||
_load_extensions(db, load_extension)
|
|
||||||
try:
|
|
||||||
db.table(table).drop_index(index, ignore=ignore)
|
|
||||||
except OperationalError as ex:
|
|
||||||
raise click.ClickException(str(ex))
|
|
||||||
|
|
||||||
|
|
||||||
@cli.command(name="enable-fts")
|
@cli.command(name="enable-fts")
|
||||||
@click.argument(
|
@click.argument(
|
||||||
"path",
|
"path",
|
||||||
|
|
@ -895,7 +863,7 @@ def enable_counts(path, tables, load_extension):
|
||||||
# Check all tables exist
|
# Check all tables exist
|
||||||
bad_tables = [table for table in tables if not db[table].exists()]
|
bad_tables = [table for table in tables if not db[table].exists()]
|
||||||
if bad_tables:
|
if bad_tables:
|
||||||
raise click.ClickException(f"Invalid tables: {bad_tables}")
|
raise click.ClickException("Invalid tables: {}".format(bad_tables))
|
||||||
for table in tables:
|
for table in tables:
|
||||||
db.table(table).enable_counts()
|
db.table(table).enable_counts()
|
||||||
|
|
||||||
|
|
@ -1144,7 +1112,9 @@ def insert_upsert_implementation(
|
||||||
)
|
)
|
||||||
):
|
):
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"{e.args[0]}\n\nTry using --alter to add additional columns"
|
"{}\n\nTry using --alter to add additional columns".format(
|
||||||
|
e.args[0]
|
||||||
|
)
|
||||||
)
|
)
|
||||||
# If we can find sql= and parameters= arguments, show those
|
# If we can find sql= and parameters= arguments, show those
|
||||||
variables = _find_variables(e.__traceback__, ["sql", "parameters"])
|
variables = _find_variables(e.__traceback__, ["sql", "parameters"])
|
||||||
|
|
@ -1242,7 +1212,7 @@ def insert_upsert_implementation(
|
||||||
reader = csv_std.reader(decoded, **csv_reader_args) # type: ignore
|
reader = csv_std.reader(decoded, **csv_reader_args) # type: ignore
|
||||||
first_row = next(reader)
|
first_row = next(reader)
|
||||||
if no_headers:
|
if no_headers:
|
||||||
headers = [f"untitled_{i + 1}" for i in range(len(first_row))]
|
headers = ["untitled_{}".format(i + 1) for i in range(len(first_row))]
|
||||||
reader = itertools.chain([first_row], reader)
|
reader = itertools.chain([first_row], reader)
|
||||||
else:
|
else:
|
||||||
headers = first_row
|
headers = first_row
|
||||||
|
|
@ -1271,7 +1241,9 @@ def insert_upsert_implementation(
|
||||||
docs = [docs]
|
docs = [docs]
|
||||||
except json.decoder.JSONDecodeError as ex:
|
except json.decoder.JSONDecodeError as ex:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"Invalid JSON - use --csv for CSV or --tsv for TSV files\n\nJSON error: {ex}"
|
"Invalid JSON - use --csv for CSV or --tsv for TSV files\n\nJSON error: {}".format(
|
||||||
|
ex
|
||||||
|
)
|
||||||
)
|
)
|
||||||
if flatten:
|
if flatten:
|
||||||
docs = (_flatten(doc) for doc in docs)
|
docs = (_flatten(doc) for doc in docs)
|
||||||
|
|
@ -1290,7 +1262,7 @@ def insert_upsert_implementation(
|
||||||
docs = (fn(doc["line"]) for doc in docs)
|
docs = (fn(doc["line"]) for doc in docs)
|
||||||
elif text:
|
elif text:
|
||||||
# Special case: this is allowed to be an iterable
|
# Special case: this is allowed to be an iterable
|
||||||
text_value = next(iter(docs))["text"]
|
text_value = list(docs)[0]["text"]
|
||||||
fn_return = fn(text_value)
|
fn_return = fn(text_value)
|
||||||
if isinstance(fn_return, dict):
|
if isinstance(fn_return, dict):
|
||||||
docs = [fn_return]
|
docs = [fn_return]
|
||||||
|
|
@ -1774,14 +1746,17 @@ def create_table(
|
||||||
ctype = columns.pop(0)
|
ctype = columns.pop(0)
|
||||||
if ctype.upper() not in VALID_COLUMN_TYPES:
|
if ctype.upper() not in VALID_COLUMN_TYPES:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"column types must be one of {VALID_COLUMN_TYPES}"
|
"column types must be one of {}".format(VALID_COLUMN_TYPES)
|
||||||
)
|
)
|
||||||
coltypes[name] = ctype.upper()
|
coltypes[name] = ctype.upper()
|
||||||
# Does table already exist?
|
# Does table already exist?
|
||||||
if table in db.table_names() and not ignore and not replace and not transform:
|
if table in db.table_names():
|
||||||
raise click.ClickException(
|
if not ignore and not replace and not transform:
|
||||||
f'Table "{table}" already exists. Use --replace to delete and replace it.'
|
raise click.ClickException(
|
||||||
)
|
'Table "{}" already exists. Use --replace to delete and replace it.'.format(
|
||||||
|
table
|
||||||
|
)
|
||||||
|
)
|
||||||
db.table(table).create(
|
db.table(table).create(
|
||||||
coltypes,
|
coltypes,
|
||||||
pk=pks[0] if len(pks) == 1 else pks,
|
pk=pks[0] if len(pks) == 1 else pks,
|
||||||
|
|
@ -1816,7 +1791,7 @@ def duplicate(path, table, new_table, ignore, load_extension):
|
||||||
db.table(table).duplicate(new_table)
|
db.table(table).duplicate(new_table)
|
||||||
except NoTable:
|
except NoTable:
|
||||||
if not ignore:
|
if not ignore:
|
||||||
raise click.ClickException(f'Table "{table}" does not exist')
|
raise click.ClickException('Table "{}" does not exist'.format(table))
|
||||||
|
|
||||||
|
|
||||||
@cli.command(name="rename-table")
|
@cli.command(name="rename-table")
|
||||||
|
|
@ -1840,7 +1815,9 @@ def rename_table(path, table, new_name, ignore, load_extension):
|
||||||
db.rename_table(table, new_name)
|
db.rename_table(table, new_name)
|
||||||
except sqlite3.OperationalError as ex:
|
except sqlite3.OperationalError as ex:
|
||||||
if not ignore:
|
if not ignore:
|
||||||
raise click.ClickException(f'Table "{table}" could not be renamed. {ex!s}')
|
raise click.ClickException(
|
||||||
|
'Table "{}" could not be renamed. {}'.format(table, str(ex))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@cli.command(name="drop-table")
|
@cli.command(name="drop-table")
|
||||||
|
|
@ -1869,10 +1846,10 @@ def drop_table(path, table, ignore, load_extension):
|
||||||
# A view exists with this name
|
# A view exists with this name
|
||||||
if not ignore:
|
if not ignore:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f'"{table}" is a view, not a table - use drop-view to drop it'
|
'"{}" is a view, not a table - use drop-view to drop it'.format(table)
|
||||||
)
|
)
|
||||||
except OperationalError:
|
except OperationalError:
|
||||||
raise click.ClickException(f'Table "{table}" does not exist')
|
raise click.ClickException('Table "{}" does not exist'.format(table))
|
||||||
|
|
||||||
|
|
||||||
@cli.command(name="create-view")
|
@cli.command(name="create-view")
|
||||||
|
|
@ -1914,7 +1891,9 @@ def create_view(path, view, select, ignore, replace, load_extension):
|
||||||
db.view(view).drop()
|
db.view(view).drop()
|
||||||
else:
|
else:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f'View "{view}" already exists. Use --replace to delete and replace it.'
|
'View "{}" already exists. Use --replace to delete and replace it.'.format(
|
||||||
|
view
|
||||||
|
)
|
||||||
)
|
)
|
||||||
db.create_view(view, select)
|
db.create_view(view, select)
|
||||||
|
|
||||||
|
|
@ -1946,9 +1925,9 @@ def drop_view(path, view, ignore, load_extension):
|
||||||
return
|
return
|
||||||
if view in db.table_names():
|
if view in db.table_names():
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f'"{view}" is a table, not a view - use drop-table to drop it'
|
'"{}" is a table, not a view - use drop-table to drop it'.format(view)
|
||||||
)
|
)
|
||||||
raise click.ClickException(f'View "{view}" does not exist')
|
raise click.ClickException('View "{}" does not exist'.format(view))
|
||||||
|
|
||||||
|
|
||||||
@cli.command()
|
@cli.command()
|
||||||
|
|
@ -2170,7 +2149,7 @@ def memory(
|
||||||
file_path = pathlib.Path(path)
|
file_path = pathlib.Path(path)
|
||||||
stem = file_path.stem
|
stem = file_path.stem
|
||||||
if stem_counts.get(stem):
|
if stem_counts.get(stem):
|
||||||
file_table = f"{stem}_{stem_counts[stem]}"
|
file_table = "{}_{}".format(stem, stem_counts[stem])
|
||||||
else:
|
else:
|
||||||
file_table = stem
|
file_table = stem
|
||||||
stem_counts[stem] = stem_counts.get(stem, 1) + 1
|
stem_counts[stem] = stem_counts.get(stem, 1) + 1
|
||||||
|
|
@ -2189,14 +2168,14 @@ def memory(
|
||||||
if tracker is not None and db.table(file_table).exists():
|
if tracker is not None and db.table(file_table).exists():
|
||||||
db.table(file_table).transform(types=tracker.types)
|
db.table(file_table).transform(types=tracker.types)
|
||||||
# Add convenient t / t1 / t2 views
|
# Add convenient t / t1 / t2 views
|
||||||
view_names = [f"t{i + 1}"]
|
view_names = ["t{}".format(i + 1)]
|
||||||
if i == 0:
|
if i == 0:
|
||||||
view_names.append("t")
|
view_names.append("t")
|
||||||
for view_name in view_names:
|
for view_name in view_names:
|
||||||
if not db[view_name].exists():
|
if not db[view_name].exists():
|
||||||
db.create_view(
|
db.create_view(
|
||||||
view_name,
|
view_name,
|
||||||
f"select * from {quote_identifier(file_table)}",
|
"select * from {}".format(quote_identifier(file_table)),
|
||||||
)
|
)
|
||||||
finally:
|
finally:
|
||||||
if should_close_fp and fp:
|
if should_close_fp and fp:
|
||||||
|
|
@ -2366,17 +2345,19 @@ def search(
|
||||||
# Check table exists
|
# Check table exists
|
||||||
table_obj = db.table(dbtable)
|
table_obj = db.table(dbtable)
|
||||||
if not table_obj.exists():
|
if not table_obj.exists():
|
||||||
raise click.ClickException(f"Table '{dbtable}' does not exist")
|
raise click.ClickException("Table '{}' does not exist".format(dbtable))
|
||||||
if not table_obj.detect_fts():
|
if not table_obj.detect_fts():
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"Table '{dbtable}' is not configured for full-text search"
|
"Table '{}' is not configured for full-text search".format(dbtable)
|
||||||
)
|
)
|
||||||
if column:
|
if column:
|
||||||
# Check they all exist
|
# Check they all exist
|
||||||
table_columns = table_obj.columns_dict
|
table_columns = table_obj.columns_dict
|
||||||
for c in column:
|
for c in column:
|
||||||
if c not in table_columns:
|
if c not in table_columns:
|
||||||
raise click.ClickException(f"Table '{dbtable}' has no column '{c}")
|
raise click.ClickException(
|
||||||
|
"Table '{}' has no column '{}".format(dbtable, c)
|
||||||
|
)
|
||||||
sql = table_obj.search_sql(columns=column, order_by=order, limit=limit)
|
sql = table_obj.search_sql(columns=column, order_by=order, limit=limit)
|
||||||
if show_sql:
|
if show_sql:
|
||||||
click.echo(sql)
|
click.echo(sql)
|
||||||
|
|
@ -2403,7 +2384,7 @@ def search(
|
||||||
except click.ClickException as e:
|
except click.ClickException as e:
|
||||||
if "malformed MATCH expression" in str(e) or "unterminated string" in str(e):
|
if "malformed MATCH expression" in str(e) or "unterminated string" in str(e):
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"{e!s}\n\nTry running this again with the --quote option"
|
"{}\n\nTry running this again with the --quote option".format(str(e))
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
|
|
@ -2470,15 +2451,15 @@ def rows(
|
||||||
columns = "*"
|
columns = "*"
|
||||||
if column:
|
if column:
|
||||||
columns = ", ".join(quote_identifier(c) for c in column)
|
columns = ", ".join(quote_identifier(c) for c in column)
|
||||||
sql = f"select {columns} from {quote_identifier(dbtable)}"
|
sql = "select {} from {}".format(columns, quote_identifier(dbtable))
|
||||||
if where:
|
if where:
|
||||||
sql += " where " + where
|
sql += " where " + where
|
||||||
if order:
|
if order:
|
||||||
sql += " order by " + order
|
sql += " order by " + order
|
||||||
if limit:
|
if limit:
|
||||||
sql += f" limit {limit}"
|
sql += " limit {}".format(limit)
|
||||||
if offset:
|
if offset:
|
||||||
sql += f" offset {offset}"
|
sql += " offset {}".format(offset)
|
||||||
ctx.invoke(
|
ctx.invoke(
|
||||||
query,
|
query,
|
||||||
path=path,
|
path=path,
|
||||||
|
|
@ -2709,11 +2690,6 @@ def schema(
|
||||||
multiple=True,
|
multiple=True,
|
||||||
help="Drop foreign key constraint for this column",
|
help="Drop foreign key constraint for this column",
|
||||||
)
|
)
|
||||||
@click.option(
|
|
||||||
"--strict/--no-strict",
|
|
||||||
default=None,
|
|
||||||
help="Enable or disable STRICT mode (default: preserve current mode)",
|
|
||||||
)
|
|
||||||
@click.option("--sql", is_flag=True, help="Output SQL without executing it")
|
@click.option("--sql", is_flag=True, help="Output SQL without executing it")
|
||||||
@load_extension_option
|
@load_extension_option
|
||||||
def transform(
|
def transform(
|
||||||
|
|
@ -2731,7 +2707,6 @@ def transform(
|
||||||
default_none,
|
default_none,
|
||||||
add_foreign_keys,
|
add_foreign_keys,
|
||||||
drop_foreign_keys,
|
drop_foreign_keys,
|
||||||
strict,
|
|
||||||
sql,
|
sql,
|
||||||
load_extension,
|
load_extension,
|
||||||
):
|
):
|
||||||
|
|
@ -2751,7 +2726,7 @@ def transform(
|
||||||
for column, ctype in type:
|
for column, ctype in type:
|
||||||
if ctype.upper() not in VALID_COLUMN_TYPES:
|
if ctype.upper() not in VALID_COLUMN_TYPES:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"column types must be one of {VALID_COLUMN_TYPES}"
|
"column types must be one of {}".format(VALID_COLUMN_TYPES)
|
||||||
)
|
)
|
||||||
types[column] = ctype.upper()
|
types[column] = ctype.upper()
|
||||||
|
|
||||||
|
|
@ -2793,7 +2768,6 @@ def transform(
|
||||||
defaults=default_dict,
|
defaults=default_dict,
|
||||||
drop_foreign_keys=drop_foreign_keys_value,
|
drop_foreign_keys=drop_foreign_keys_value,
|
||||||
add_foreign_keys=add_foreign_keys_value,
|
add_foreign_keys=add_foreign_keys_value,
|
||||||
strict=strict,
|
|
||||||
):
|
):
|
||||||
click.echo(line)
|
click.echo(line)
|
||||||
else:
|
else:
|
||||||
|
|
@ -2807,7 +2781,6 @@ def transform(
|
||||||
defaults=default_dict,
|
defaults=default_dict,
|
||||||
drop_foreign_keys=drop_foreign_keys_value,
|
drop_foreign_keys=drop_foreign_keys_value,
|
||||||
add_foreign_keys=add_foreign_keys_value,
|
add_foreign_keys=add_foreign_keys_value,
|
||||||
strict=strict,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -2849,12 +2822,12 @@ def extract(
|
||||||
db = sqlite_utils.Database(path)
|
db = sqlite_utils.Database(path)
|
||||||
_register_db_for_cleanup(db)
|
_register_db_for_cleanup(db)
|
||||||
_load_extensions(db, load_extension)
|
_load_extensions(db, load_extension)
|
||||||
kwargs: dict[str, Any] = {
|
kwargs: dict[str, Any] = dict(
|
||||||
"columns": columns,
|
columns=columns,
|
||||||
"table": other_table,
|
table=other_table,
|
||||||
"fk_column": fk_column,
|
fk_column=fk_column,
|
||||||
"rename": dict(rename),
|
rename=dict(rename),
|
||||||
}
|
)
|
||||||
try:
|
try:
|
||||||
db.table(table).extract(**kwargs)
|
db.table(table).extract(**kwargs)
|
||||||
except (NoTable, InvalidColumns) as e:
|
except (NoTable, InvalidColumns) as e:
|
||||||
|
|
@ -2949,7 +2922,7 @@ def insert_files(
|
||||||
with progressbar(paths_and_relative_paths, silent=silent) as bar:
|
with progressbar(paths_and_relative_paths, silent=silent) as bar:
|
||||||
|
|
||||||
def to_insert():
|
def to_insert():
|
||||||
for file_path, relative_path in bar:
|
for path, relative_path in bar:
|
||||||
row = {}
|
row = {}
|
||||||
# content_text is special case as it considers 'encoding'
|
# content_text is special case as it considers 'encoding'
|
||||||
|
|
||||||
|
|
@ -2961,21 +2934,19 @@ def insert_files(
|
||||||
raise UnicodeDecodeErrorForPath(e, resolved)
|
raise UnicodeDecodeErrorForPath(e, resolved)
|
||||||
|
|
||||||
lookups = dict(FILE_COLUMNS, content_text=_content_text)
|
lookups = dict(FILE_COLUMNS, content_text=_content_text)
|
||||||
if file_path == "-":
|
if path == "-":
|
||||||
stdin_data = sys.stdin.buffer.read()
|
stdin_data = sys.stdin.buffer.read()
|
||||||
# We only support a subset of columns for this case
|
# We only support a subset of columns for this case
|
||||||
lookups = {
|
lookups = {
|
||||||
"name": lambda p: name or "-",
|
"name": lambda p: name or "-",
|
||||||
"path": lambda p: name or "-",
|
"path": lambda p: name or "-",
|
||||||
"content": lambda p, data=stdin_data: data,
|
"content": lambda p: stdin_data,
|
||||||
"content_text": lambda p, data=stdin_data: data.decode(
|
"content_text": lambda p: stdin_data.decode(
|
||||||
encoding or "utf-8"
|
encoding or "utf-8"
|
||||||
),
|
),
|
||||||
"sha256": lambda p, data=stdin_data: hashlib.sha256(
|
"sha256": lambda p: hashlib.sha256(stdin_data).hexdigest(),
|
||||||
data
|
"md5": lambda p: hashlib.md5(stdin_data).hexdigest(),
|
||||||
).hexdigest(),
|
"size": lambda p: len(stdin_data),
|
||||||
"md5": lambda p, data=stdin_data: hashlib.md5(data).hexdigest(),
|
|
||||||
"size": lambda p, data=stdin_data: len(data),
|
|
||||||
}
|
}
|
||||||
for coldef in column:
|
for coldef in column:
|
||||||
if ":" in coldef:
|
if ":" in coldef:
|
||||||
|
|
@ -2983,7 +2954,7 @@ def insert_files(
|
||||||
else:
|
else:
|
||||||
colname, coltype = coldef, coldef
|
colname, coltype = coldef, coldef
|
||||||
try:
|
try:
|
||||||
value = lookups[coltype](file_path)
|
value = lookups[coltype](path)
|
||||||
row[colname] = value
|
row[colname] = value
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
|
|
@ -3011,7 +2982,7 @@ def insert_files(
|
||||||
except UnicodeDecodeErrorForPath as e:
|
except UnicodeDecodeErrorForPath as e:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
UNICODE_ERROR.format(
|
UNICODE_ERROR.format(
|
||||||
f"Could not read file '{e.path}' as text\n\n{e.exception}"
|
"Could not read file '{}' as text\n\n{}".format(e.path, e.exception)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -3189,7 +3160,7 @@ def _generate_convert_help():
|
||||||
for name in recipe_names:
|
for name in recipe_names:
|
||||||
fn = getattr(recipes, name)
|
fn = getattr(recipes, name)
|
||||||
doc = textwrap.dedent(fn.__doc__.rstrip()).replace("\b\n", "")
|
doc = textwrap.dedent(fn.__doc__.rstrip()).replace("\b\n", "")
|
||||||
help += f"\n\nr.{name}{inspect.signature(fn)!s}\n\n\b{doc}"
|
help += "\n\nr.{}{}\n\n\b{}".format(name, str(inspect.signature(fn)), doc)
|
||||||
help += "\n\n"
|
help += "\n\n"
|
||||||
help += textwrap.dedent("""
|
help += textwrap.dedent("""
|
||||||
You can use these recipes like so:
|
You can use these recipes like so:
|
||||||
|
|
@ -3292,7 +3263,7 @@ def convert(
|
||||||
""".format(
|
""".format(
|
||||||
column=columns[0],
|
column=columns[0],
|
||||||
table=table,
|
table=table,
|
||||||
where=f" where {where}" if where is not None else "",
|
where=" where {}".format(where) if where is not None else "",
|
||||||
)
|
)
|
||||||
for row in db.conn.execute(sql, where_args).fetchall():
|
for row in db.conn.execute(sql, where_args).fetchall():
|
||||||
click.echo(str(row[0]))
|
click.echo(str(row[0]))
|
||||||
|
|
@ -3312,7 +3283,7 @@ def convert(
|
||||||
def wrapped_fn(value):
|
def wrapped_fn(value):
|
||||||
try:
|
try:
|
||||||
return fn_(value)
|
return fn_(value)
|
||||||
except Exception as ex: # noqa: BLE001
|
except Exception as ex:
|
||||||
print("\nException raised, dropping into pdb...:", ex)
|
print("\nException raised, dropping into pdb...:", ex)
|
||||||
pdb.post_mortem(ex.__traceback__)
|
pdb.post_mortem(ex.__traceback__)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
@ -3332,7 +3303,9 @@ def convert(
|
||||||
)
|
)
|
||||||
except BadMultiValues as e:
|
except BadMultiValues as e:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"When using --multi code must return a Python dictionary - returned: {e.values!r}"
|
"When using --multi code must return a Python dictionary - returned: {}".format(
|
||||||
|
repr(e.values)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3450,7 +3423,7 @@ def create_spatial_index(db_path, table, column_name, load_extension):
|
||||||
|
|
||||||
def _find_migration_files(migrations):
|
def _find_migration_files(migrations):
|
||||||
if not migrations:
|
if not migrations:
|
||||||
migrations = [pathlib.Path.cwd()]
|
migrations = [pathlib.Path(".").resolve()]
|
||||||
files = set()
|
files = set()
|
||||||
for path_str in migrations:
|
for path_str in migrations:
|
||||||
path = pathlib.Path(path_str)
|
path = pathlib.Path(path_str)
|
||||||
|
|
@ -3475,7 +3448,7 @@ def _load_migration_sets(files):
|
||||||
"__file__": str(filepath),
|
"__file__": str(filepath),
|
||||||
"__name__": "__sqlite_utils_migration__",
|
"__name__": "__sqlite_utils_migration__",
|
||||||
}
|
}
|
||||||
exec(code, namespace) # noqa: S102
|
exec(code, namespace)
|
||||||
migration_sets.extend(
|
migration_sets.extend(
|
||||||
obj for obj in namespace.values() if _compatible_migration_set(obj)
|
obj for obj in namespace.values() if _compatible_migration_set(obj)
|
||||||
)
|
)
|
||||||
|
|
@ -3484,17 +3457,17 @@ def _load_migration_sets(files):
|
||||||
|
|
||||||
def _display_migration_list(db, migration_sets):
|
def _display_migration_list(db, migration_sets):
|
||||||
for migration_set in migration_sets:
|
for migration_set in migration_sets:
|
||||||
click.echo(f"Migrations for: {migration_set.name}")
|
click.echo("Migrations for: {}".format(migration_set.name))
|
||||||
click.echo()
|
click.echo()
|
||||||
click.echo(" Applied:")
|
click.echo(" Applied:")
|
||||||
for migration in migration_set.applied(db):
|
for migration in migration_set.applied(db):
|
||||||
click.echo(f" {migration.name} - {migration.applied_at}")
|
click.echo(" {} - {}".format(migration.name, migration.applied_at))
|
||||||
click.echo()
|
click.echo()
|
||||||
click.echo(" Pending:")
|
click.echo(" Pending:")
|
||||||
output = False
|
output = False
|
||||||
for migration in migration_set.pending(db):
|
for migration in migration_set.pending(db):
|
||||||
output = True
|
output = True
|
||||||
click.echo(f" {migration.name}")
|
click.echo(" {}".format(migration.name))
|
||||||
if not output:
|
if not output:
|
||||||
click.echo(" (none)")
|
click.echo(" (none)")
|
||||||
click.echo()
|
click.echo()
|
||||||
|
|
@ -3574,7 +3547,7 @@ def migrate(db_path, migrations, stop_before, list_, verbose):
|
||||||
|
|
||||||
prev_schema = db.schema
|
prev_schema = db.schema
|
||||||
if verbose:
|
if verbose:
|
||||||
click.echo(f"Migrating {db_path}")
|
click.echo("Migrating {}".format(db_path))
|
||||||
click.echo("\nSchema before:\n")
|
click.echo("\nSchema before:\n")
|
||||||
click.echo(textwrap.indent(prev_schema, " ") or " (empty)")
|
click.echo(textwrap.indent(prev_schema, " ") or " (empty)")
|
||||||
click.echo()
|
click.echo()
|
||||||
|
|
@ -3585,7 +3558,9 @@ def migrate(db_path, migrations, stop_before, list_, verbose):
|
||||||
names = {m.name for m in migration_set.pending(db)}
|
names = {m.name for m in migration_set.pending(db)}
|
||||||
names.update(m.name for m in migration_set.applied(db))
|
names.update(m.name for m in migration_set.applied(db))
|
||||||
known_names.update(names)
|
known_names.update(names)
|
||||||
known_names.update(f"{migration_set.name}:{name}" for name in names)
|
known_names.update(
|
||||||
|
"{}:{}".format(migration_set.name, name) for name in names
|
||||||
|
)
|
||||||
unknown = [value for value in stop_before if value not in known_names]
|
unknown = [value for value in stop_before if value not in known_names]
|
||||||
if unknown:
|
if unknown:
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
|
|
@ -3641,7 +3616,7 @@ def _render_common(title, values):
|
||||||
return ""
|
return ""
|
||||||
lines = [title]
|
lines = [title]
|
||||||
for value, count in values:
|
for value, count in values:
|
||||||
lines.append(f" {count}: {value}")
|
lines.append(" {}: {}".format(count, value))
|
||||||
return "\n".join(lines)
|
return "\n".join(lines)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3711,7 +3686,7 @@ def maybe_json(value):
|
||||||
if not isinstance(value, str):
|
if not isinstance(value, str):
|
||||||
return value
|
return value
|
||||||
stripped = value.strip()
|
stripped = value.strip()
|
||||||
if not (stripped.startswith(("{", "["))):
|
if not (stripped.startswith("{") or stripped.startswith("[")):
|
||||||
return value
|
return value
|
||||||
try:
|
try:
|
||||||
return json.loads(stripped)
|
return json.loads(stripped)
|
||||||
|
|
@ -3729,7 +3704,7 @@ def json_binary(value):
|
||||||
def verify_is_dict(doc):
|
def verify_is_dict(doc):
|
||||||
if not isinstance(doc, dict):
|
if not isinstance(doc, dict):
|
||||||
raise click.ClickException(
|
raise click.ClickException(
|
||||||
f"Rows must all be dictionaries, got: {repr(doc)[:1000]}"
|
"Rows must all be dictionaries, got: {}".format(repr(doc)[:1000])
|
||||||
)
|
)
|
||||||
return doc
|
return doc
|
||||||
|
|
||||||
|
|
@ -3757,14 +3732,14 @@ def _register_functions(db, functions):
|
||||||
try:
|
try:
|
||||||
functions = pathlib.Path(functions).read_text()
|
functions = pathlib.Path(functions).read_text()
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
raise click.ClickException(f"File not found: {functions}")
|
raise click.ClickException("File not found: {}".format(functions))
|
||||||
|
|
||||||
sqlite3.enable_callback_tracebacks(True)
|
sqlite3.enable_callback_tracebacks(True)
|
||||||
globals = {}
|
globals = {}
|
||||||
try:
|
try:
|
||||||
exec(functions, globals) # noqa: S102
|
exec(functions, globals)
|
||||||
except SyntaxError as ex:
|
except SyntaxError as ex:
|
||||||
raise click.ClickException(f"Error in functions definition: {ex}")
|
raise click.ClickException("Error in functions definition: {}".format(ex))
|
||||||
# Register all callables in the locals dict:
|
# Register all callables in the locals dict:
|
||||||
for name, value in globals.items():
|
for name, value in globals.items():
|
||||||
if callable(value) and not name.startswith("_"):
|
if callable(value) and not name.startswith("_"):
|
||||||
|
|
@ -3785,12 +3760,12 @@ def _rows_from_code(code):
|
||||||
try:
|
try:
|
||||||
code = pathlib.Path(code).read_text()
|
code = pathlib.Path(code).read_text()
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
raise click.ClickException(f"File not found: {code}")
|
raise click.ClickException("File not found: {}".format(code))
|
||||||
namespace = {}
|
namespace = {}
|
||||||
try:
|
try:
|
||||||
exec(code, namespace) # noqa: S102
|
exec(code, namespace)
|
||||||
except SyntaxError as ex:
|
except SyntaxError as ex:
|
||||||
raise click.ClickException(f"Error in --code: {ex}")
|
raise click.ClickException("Error in --code: {}".format(ex))
|
||||||
rows = namespace.get("rows")
|
rows = namespace.get("rows")
|
||||||
if callable(rows):
|
if callable(rows):
|
||||||
rows = rows()
|
rows = rows()
|
||||||
|
|
|
||||||
1046
sqlite_utils/db.py
1046
sqlite_utils/db.py
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,8 @@
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
|
||||||
import click
|
import click
|
||||||
from pluggy import HookimplMarker, HookspecMarker
|
from pluggy import HookimplMarker
|
||||||
|
from pluggy import HookspecMarker
|
||||||
|
|
||||||
hookspec = HookspecMarker("sqlite_utils")
|
hookspec = HookspecMarker("sqlite_utils")
|
||||||
hookimpl = HookimplMarker("sqlite_utils")
|
hookimpl = HookimplMarker("sqlite_utils")
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,19 @@
|
||||||
import datetime
|
from collections.abc import Iterable
|
||||||
from collections.abc import Callable, Iterable
|
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import TYPE_CHECKING, Protocol, TypeVar, cast
|
import datetime
|
||||||
|
from typing import Callable, cast, TYPE_CHECKING
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from sqlite_utils.db import Database, Table
|
from sqlite_utils.db import Database, Table
|
||||||
|
|
||||||
|
|
||||||
class _MigrationFunction(Protocol):
|
|
||||||
__name__: str
|
|
||||||
|
|
||||||
def __call__(self, db: "Database", /) -> None: ...
|
|
||||||
|
|
||||||
|
|
||||||
_MigrationFunctionT = TypeVar("_MigrationFunctionT", bound=_MigrationFunction)
|
|
||||||
|
|
||||||
|
|
||||||
class Migrations:
|
class Migrations:
|
||||||
migrations_table = "_sqlite_migrations"
|
migrations_table = "_sqlite_migrations"
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class _Migration:
|
class _Migration:
|
||||||
name: str
|
name: str
|
||||||
fn: _MigrationFunction
|
fn: Callable
|
||||||
transactional: bool = True
|
transactional: bool = True
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
|
|
@ -41,7 +32,7 @@ class Migrations:
|
||||||
|
|
||||||
def __call__(
|
def __call__(
|
||||||
self, *, name: str | None = None, transactional: bool = True
|
self, *, name: str | None = None, transactional: bool = True
|
||||||
) -> Callable[[_MigrationFunctionT], _MigrationFunctionT]:
|
) -> Callable:
|
||||||
"""
|
"""
|
||||||
:param name: The name to use for this migration - if not provided,
|
:param name: The name to use for this migration - if not provided,
|
||||||
the name of the function will be used.
|
the name of the function will be used.
|
||||||
|
|
@ -52,11 +43,13 @@ class Migrations:
|
||||||
example those that execute ``VACUUM``.
|
example those that execute ``VACUUM``.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def inner(func: _MigrationFunctionT) -> _MigrationFunctionT:
|
def inner(func: Callable) -> Callable:
|
||||||
migration_name = name or func.__name__
|
migration_name = name or getattr(func, "__name__")
|
||||||
if any(m.name == migration_name for m in self._migrations):
|
if any(m.name == migration_name for m in self._migrations):
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
f"Migration '{migration_name}' is already registered in set '{self.name}'"
|
"Migration '{}' is already registered in set '{}'".format(
|
||||||
|
migration_name, self.name
|
||||||
|
)
|
||||||
)
|
)
|
||||||
self._migrations.append(
|
self._migrations.append(
|
||||||
self._Migration(migration_name, func, transactional)
|
self._Migration(migration_name, func, transactional)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import sys
|
from typing import Dict, List, Union
|
||||||
|
|
||||||
import pluggy
|
import pluggy
|
||||||
|
import sys
|
||||||
from . import hookspecs
|
from . import hookspecs
|
||||||
|
|
||||||
pm: pluggy.PluginManager = pluggy.PluginManager("sqlite_utils")
|
pm: pluggy.PluginManager = pluggy.PluginManager("sqlite_utils")
|
||||||
|
|
@ -17,13 +17,13 @@ def ensure_plugins_loaded() -> None:
|
||||||
_plugins_loaded = True
|
_plugins_loaded = True
|
||||||
|
|
||||||
|
|
||||||
def get_plugins() -> list[dict[str, str | list[str]]]:
|
def get_plugins() -> List[Dict[str, Union[str, List[str]]]]:
|
||||||
ensure_plugins_loaded()
|
ensure_plugins_loaded()
|
||||||
plugins: list[dict[str, str | list[str]]] = []
|
plugins: List[Dict[str, Union[str, List[str]]]] = []
|
||||||
plugin_to_distinfo = dict(pm.list_plugin_distinfo())
|
plugin_to_distinfo = dict(pm.list_plugin_distinfo())
|
||||||
for plugin in pm.get_plugins():
|
for plugin in pm.get_plugins():
|
||||||
hookcallers = pm.get_hookcallers(plugin) or []
|
hookcallers = pm.get_hookcallers(plugin) or []
|
||||||
plugin_info: dict[str, str | list[str]] = {
|
plugin_info: Dict[str, Union[str, List[str]]] = {
|
||||||
"name": plugin.__name__,
|
"name": plugin.__name__,
|
||||||
"hooks": [h.name for h in hookcallers],
|
"hooks": [h.name for h in hookcallers],
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import json
|
from typing import Callable, Optional
|
||||||
from collections.abc import Callable
|
|
||||||
|
|
||||||
from dateutil import parser
|
from dateutil import parser
|
||||||
|
import json
|
||||||
|
|
||||||
IGNORE: object = object()
|
IGNORE: object = object()
|
||||||
SET_NULL: object = object()
|
SET_NULL: object = object()
|
||||||
|
|
@ -13,8 +13,8 @@ def parsedate(
|
||||||
value: str,
|
value: str,
|
||||||
dayfirst: bool = False,
|
dayfirst: bool = False,
|
||||||
yearfirst: bool = False,
|
yearfirst: bool = False,
|
||||||
errors: object | None = None,
|
errors: Optional[object] = None,
|
||||||
) -> str | None:
|
) -> Optional[str]:
|
||||||
"""
|
"""
|
||||||
Parse a date and convert it to ISO date format: yyyy-mm-dd
|
Parse a date and convert it to ISO date format: yyyy-mm-dd
|
||||||
\b
|
\b
|
||||||
|
|
@ -44,8 +44,8 @@ def parsedatetime(
|
||||||
value: str,
|
value: str,
|
||||||
dayfirst: bool = False,
|
dayfirst: bool = False,
|
||||||
yearfirst: bool = False,
|
yearfirst: bool = False,
|
||||||
errors: object | None = None,
|
errors: Optional[object] = None,
|
||||||
) -> str | None:
|
) -> Optional[str]:
|
||||||
"""
|
"""
|
||||||
Parse a datetime and convert it to ISO datetime format: yyyy-mm-ddTHH:MM:SS
|
Parse a datetime and convert it to ISO datetime format: yyyy-mm-ddTHH:MM:SS
|
||||||
\b
|
\b
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,20 @@ import itertools
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
from collections.abc import Callable, Generator, Iterable, Iterator
|
|
||||||
from typing import (
|
from typing import (
|
||||||
TYPE_CHECKING,
|
|
||||||
Any,
|
Any,
|
||||||
BinaryIO,
|
BinaryIO,
|
||||||
|
Callable,
|
||||||
|
Dict,
|
||||||
|
Generator,
|
||||||
|
Iterable,
|
||||||
|
Iterator,
|
||||||
|
List,
|
||||||
|
Optional,
|
||||||
|
Set,
|
||||||
|
Tuple,
|
||||||
|
Type,
|
||||||
|
TYPE_CHECKING,
|
||||||
TypeVar,
|
TypeVar,
|
||||||
Union,
|
Union,
|
||||||
cast,
|
cast,
|
||||||
|
|
@ -24,8 +33,8 @@ import click
|
||||||
from . import recipes
|
from . import recipes
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
import sqlite3
|
import sqlite3 # noqa: F401
|
||||||
from sqlite3 import dbapi2
|
from sqlite3 import dbapi2 # noqa: F401
|
||||||
|
|
||||||
OperationalError = dbapi2.OperationalError
|
OperationalError = dbapi2.OperationalError
|
||||||
else:
|
else:
|
||||||
|
|
@ -35,7 +44,7 @@ else:
|
||||||
OperationalError = dbapi2.OperationalError
|
OperationalError = dbapi2.OperationalError
|
||||||
except ImportError:
|
except ImportError:
|
||||||
import sqlite3 # noqa: F401
|
import sqlite3 # noqa: F401
|
||||||
from sqlite3 import dbapi2
|
from sqlite3 import dbapi2 # noqa: F401
|
||||||
|
|
||||||
OperationalError = dbapi2.OperationalError
|
OperationalError = dbapi2.OperationalError
|
||||||
|
|
||||||
|
|
@ -52,8 +61,8 @@ SPATIALITE_PATHS = (
|
||||||
ORIGINAL_CSV_FIELD_SIZE_LIMIT = csv.field_size_limit()
|
ORIGINAL_CSV_FIELD_SIZE_LIMIT = csv.field_size_limit()
|
||||||
|
|
||||||
# Type alias for row dictionaries - values can be various SQLite-compatible types
|
# Type alias for row dictionaries - values can be various SQLite-compatible types
|
||||||
RowValue = None | int | float | str | bytes | bool | list[str]
|
RowValue = Union[None, int, float, str, bytes, bool, List[str]]
|
||||||
Row = dict[str, RowValue]
|
Row = Dict[str, RowValue]
|
||||||
|
|
||||||
T = TypeVar("T")
|
T = TypeVar("T")
|
||||||
|
|
||||||
|
|
@ -94,7 +103,7 @@ def maximize_csv_field_size_limit() -> None:
|
||||||
field_size_limit = int(field_size_limit / 10)
|
field_size_limit = int(field_size_limit / 10)
|
||||||
|
|
||||||
|
|
||||||
def find_spatialite() -> str | None:
|
def find_spatialite() -> Optional[str]:
|
||||||
"""
|
"""
|
||||||
The ``find_spatialite()`` function searches for the `SpatiaLite <https://www.gaia-gis.it/fossil/libspatialite/index>`__
|
The ``find_spatialite()`` function searches for the `SpatiaLite <https://www.gaia-gis.it/fossil/libspatialite/index>`__
|
||||||
SQLite extension in some common places. It returns a string path to the location, or ``None`` if SpatiaLite was not found.
|
SQLite extension in some common places. It returns a string path to the location, or ``None`` if SpatiaLite was not found.
|
||||||
|
|
@ -123,9 +132,9 @@ def find_spatialite() -> str | None:
|
||||||
|
|
||||||
|
|
||||||
def suggest_column_types(
|
def suggest_column_types(
|
||||||
records: Iterable[dict[str, Any]],
|
records: Iterable[Dict[str, Any]],
|
||||||
) -> dict[str, type]:
|
) -> Dict[str, type]:
|
||||||
all_column_types: dict[str, set[type]] = {}
|
all_column_types: Dict[str, Set[type]] = {}
|
||||||
for record in records:
|
for record in records:
|
||||||
for key, value in record.items():
|
for key, value in record.items():
|
||||||
all_column_types.setdefault(key, set()).add(type(value))
|
all_column_types.setdefault(key, set()).add(type(value))
|
||||||
|
|
@ -133,9 +142,9 @@ def suggest_column_types(
|
||||||
|
|
||||||
|
|
||||||
def types_for_column_types(
|
def types_for_column_types(
|
||||||
all_column_types: dict[str, set[type]],
|
all_column_types: Dict[str, Set[type]],
|
||||||
) -> dict[str, type]:
|
) -> Dict[str, type]:
|
||||||
column_types: dict[str, type] = {}
|
column_types: Dict[str, type] = {}
|
||||||
for key, types in all_column_types.items():
|
for key, types in all_column_types.items():
|
||||||
# Ignore null values if at least one other type present:
|
# Ignore null values if at least one other type present:
|
||||||
if len(types) > 1:
|
if len(types) > 1:
|
||||||
|
|
@ -144,7 +153,7 @@ def types_for_column_types(
|
||||||
if {None.__class__} == types:
|
if {None.__class__} == types:
|
||||||
t = str
|
t = str
|
||||||
elif len(types) == 1:
|
elif len(types) == 1:
|
||||||
t = next(iter(types))
|
t = list(types)[0]
|
||||||
# But if it's a subclass of list / tuple / dict, use str
|
# But if it's a subclass of list / tuple / dict, use str
|
||||||
# instead as we will be storing it as JSON in the table
|
# instead as we will be storing it as JSON in the table
|
||||||
for superclass in (list, tuple, dict):
|
for superclass in (list, tuple, dict):
|
||||||
|
|
@ -181,7 +190,7 @@ def column_affinity(column_type: str) -> type:
|
||||||
return float
|
return float
|
||||||
|
|
||||||
|
|
||||||
def decode_base64_values(doc: dict[str, Any]) -> dict[str, Any]:
|
def decode_base64_values(doc: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
# Looks for '{"$base64": true..., "encoded": ...}' values and decodes them
|
# Looks for '{"$base64": true..., "encoded": ...}' values and decodes them
|
||||||
to_fix = [
|
to_fix = [
|
||||||
k
|
k
|
||||||
|
|
@ -254,9 +263,9 @@ class RowError(Exception):
|
||||||
|
|
||||||
|
|
||||||
def _extra_key_strategy(
|
def _extra_key_strategy(
|
||||||
reader: Iterable[dict[str | None, object]],
|
reader: Iterable[Dict[Optional[str], object]],
|
||||||
ignore_extras: bool | None = False,
|
ignore_extras: Optional[bool] = False,
|
||||||
extras_key: str | None = None,
|
extras_key: Optional[str] = None,
|
||||||
) -> Iterable[Row]:
|
) -> Iterable[Row]:
|
||||||
# Logic for handling CSV rows with more values than there are headings
|
# Logic for handling CSV rows with more values than there are headings
|
||||||
for row in reader:
|
for row in reader:
|
||||||
|
|
@ -270,7 +279,9 @@ def _extra_key_strategy(
|
||||||
yield cast(Row, row)
|
yield cast(Row, row)
|
||||||
elif not extras_key:
|
elif not extras_key:
|
||||||
extras = row.pop(None)
|
extras = row.pop(None)
|
||||||
raise RowError(f"Row {row} contained these extra values: {extras}")
|
raise RowError(
|
||||||
|
"Row {} contained these extra values: {}".format(row, extras)
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
extras_value = row.pop(None)
|
extras_value = row.pop(None)
|
||||||
row_out = cast(Row, row)
|
row_out = cast(Row, row)
|
||||||
|
|
@ -280,12 +291,12 @@ def _extra_key_strategy(
|
||||||
|
|
||||||
def rows_from_file(
|
def rows_from_file(
|
||||||
fp: BinaryIO,
|
fp: BinaryIO,
|
||||||
format: Format | None = None,
|
format: Optional[Format] = None,
|
||||||
dialect: type[csv.Dialect] | None = None,
|
dialect: Optional[Type[csv.Dialect]] = None,
|
||||||
encoding: str | None = None,
|
encoding: Optional[str] = None,
|
||||||
ignore_extras: bool | None = False,
|
ignore_extras: Optional[bool] = False,
|
||||||
extras_key: str | None = None,
|
extras_key: Optional[str] = None,
|
||||||
) -> tuple[Iterable[Row], Format]:
|
) -> Tuple[Iterable[Row], Format]:
|
||||||
"""
|
"""
|
||||||
Load a sequence of dictionaries from a file-like object containing one of four different formats.
|
Load a sequence of dictionaries from a file-like object containing one of four different formats.
|
||||||
|
|
||||||
|
|
@ -352,7 +363,7 @@ def rows_from_file(
|
||||||
)
|
)
|
||||||
return (
|
return (
|
||||||
_extra_key_strategy(
|
_extra_key_strategy(
|
||||||
cast(Iterable[dict[str | None, object]], rows),
|
cast(Iterable[Dict[Optional[str], object]], rows),
|
||||||
ignore_extras,
|
ignore_extras,
|
||||||
extras_key,
|
extras_key,
|
||||||
),
|
),
|
||||||
|
|
@ -368,7 +379,7 @@ def rows_from_file(
|
||||||
raise TypeError(
|
raise TypeError(
|
||||||
"rows_from_file() requires a file-like object that supports peek(), such as io.BytesIO"
|
"rows_from_file() requires a file-like object that supports peek(), such as io.BytesIO"
|
||||||
)
|
)
|
||||||
if first_bytes.startswith((b"[", b"{")):
|
if first_bytes.startswith(b"[") or first_bytes.startswith(b"{"):
|
||||||
# TODO: Detect newline-JSON
|
# TODO: Detect newline-JSON
|
||||||
return rows_from_file(buffered, format=Format.JSON)
|
return rows_from_file(buffered, format=Format.JSON)
|
||||||
else:
|
else:
|
||||||
|
|
@ -382,7 +393,7 @@ def rows_from_file(
|
||||||
detected_format = Format.TSV if dialect.delimiter == "\t" else Format.CSV
|
detected_format = Format.TSV if dialect.delimiter == "\t" else Format.CSV
|
||||||
return (
|
return (
|
||||||
_extra_key_strategy(
|
_extra_key_strategy(
|
||||||
cast(Iterable[dict[str | None, object]], rows),
|
cast(Iterable[Dict[Optional[str], object]], rows),
|
||||||
ignore_extras,
|
ignore_extras,
|
||||||
extras_key,
|
extras_key,
|
||||||
),
|
),
|
||||||
|
|
@ -414,9 +425,9 @@ class TypeTracker:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.trackers: dict[str, ValueTracker] = {}
|
self.trackers: Dict[str, "ValueTracker"] = {}
|
||||||
|
|
||||||
def wrap(self, iterator: Iterable[dict[str, Any]]) -> Iterable[dict[str, Any]]:
|
def wrap(self, iterator: Iterable[Dict[str, Any]]) -> Iterable[Dict[str, Any]]:
|
||||||
"""
|
"""
|
||||||
Use this to loop through an existing iterator, tracking the column types
|
Use this to loop through an existing iterator, tracking the column types
|
||||||
as part of the iteration.
|
as part of the iteration.
|
||||||
|
|
@ -430,7 +441,7 @@ class TypeTracker:
|
||||||
yield row
|
yield row
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def types(self) -> dict[str, str]:
|
def types(self) -> Dict[str, str]:
|
||||||
"""
|
"""
|
||||||
A dictionary mapping column names to their detected types. This can be passed
|
A dictionary mapping column names to their detected types. This can be passed
|
||||||
to the ``db[table_name].transform(types=tracker.types)`` method.
|
to the ``db[table_name].transform(types=tracker.types)`` method.
|
||||||
|
|
@ -439,15 +450,17 @@ class TypeTracker:
|
||||||
|
|
||||||
|
|
||||||
class ValueTracker:
|
class ValueTracker:
|
||||||
couldbe: dict[str, Callable[[object], bool]]
|
couldbe: Dict[str, Callable[[object], bool]]
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.couldbe = {key: getattr(self, "test_" + key) for key in self.get_tests()}
|
self.couldbe = {key: getattr(self, "test_" + key) for key in self.get_tests()}
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_tests(cls) -> list[str]:
|
def get_tests(cls) -> List[str]:
|
||||||
return [
|
return [
|
||||||
key.split("test_")[-1] for key in cls.__dict__ if key.startswith("test_")
|
key.split("test_")[-1]
|
||||||
|
for key in cls.__dict__.keys()
|
||||||
|
if key.startswith("test_")
|
||||||
]
|
]
|
||||||
|
|
||||||
def test_integer(self, value: object) -> bool:
|
def test_integer(self, value: object) -> bool:
|
||||||
|
|
@ -479,7 +492,7 @@ class ValueTracker:
|
||||||
def evaluate(self, value: object) -> None:
|
def evaluate(self, value: object) -> None:
|
||||||
if not value or not self.couldbe:
|
if not value or not self.couldbe:
|
||||||
return
|
return
|
||||||
not_these: list[str] = []
|
not_these: List[str] = []
|
||||||
for name, test in self.couldbe.items():
|
for name, test in self.couldbe.items():
|
||||||
if not test(value):
|
if not test(value):
|
||||||
not_these.append(name)
|
not_these.append(name)
|
||||||
|
|
@ -511,14 +524,14 @@ def progressbar(*args: Iterable[T], **kwargs: Any) -> Generator[Any, None, None]
|
||||||
def _compile_code(
|
def _compile_code(
|
||||||
code: str, imports: Iterable[str], variable: str = "value"
|
code: str, imports: Iterable[str], variable: str = "value"
|
||||||
) -> Callable[..., Any]:
|
) -> Callable[..., Any]:
|
||||||
globals_dict: dict[str, Any] = {"r": recipes, "recipes": recipes}
|
globals_dict: Dict[str, Any] = {"r": recipes, "recipes": recipes}
|
||||||
# Handle imports first so they're available for all approaches
|
# Handle imports first so they're available for all approaches
|
||||||
for import_ in imports:
|
for import_ in imports:
|
||||||
globals_dict[import_.split(".")[0]] = __import__(import_)
|
globals_dict[import_.split(".")[0]] = __import__(import_)
|
||||||
|
|
||||||
# If user defined a convert() function, return that
|
# If user defined a convert() function, return that
|
||||||
try:
|
try:
|
||||||
exec(code, globals_dict) # noqa: S102
|
exec(code, globals_dict)
|
||||||
return cast(Callable[..., object], globals_dict["convert"])
|
return cast(Callable[..., object], globals_dict["convert"])
|
||||||
except (AttributeError, SyntaxError, NameError, KeyError, TypeError):
|
except (AttributeError, SyntaxError, NameError, KeyError, TypeError):
|
||||||
pass
|
pass
|
||||||
|
|
@ -529,20 +542,20 @@ def _compile_code(
|
||||||
fn = eval(code, globals_dict)
|
fn = eval(code, globals_dict)
|
||||||
if callable(fn):
|
if callable(fn):
|
||||||
return cast(Callable[..., object], fn)
|
return cast(Callable[..., object], fn)
|
||||||
except Exception: # noqa: BLE001, S110
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# Try compiling their code as a function instead
|
# Try compiling their code as a function instead
|
||||||
body_variants = [code]
|
body_variants = [code]
|
||||||
# If single line and no 'return', try adding the return
|
# If single line and no 'return', try adding the return
|
||||||
if "\n" not in code and not code.strip().startswith("return "):
|
if "\n" not in code and not code.strip().startswith("return "):
|
||||||
body_variants.insert(0, f"return {code}")
|
body_variants.insert(0, "return {}".format(code))
|
||||||
|
|
||||||
code_o = None
|
code_o = None
|
||||||
for variant in body_variants:
|
for variant in body_variants:
|
||||||
new_code = [f"def fn({variable}):"]
|
new_code = ["def fn({}):".format(variable)]
|
||||||
for line in variant.split("\n"):
|
for line in variant.split("\n"):
|
||||||
new_code.append(f" {line}")
|
new_code.append(" {}".format(line))
|
||||||
try:
|
try:
|
||||||
code_o = compile("\n".join(new_code), "<string>", "exec")
|
code_o = compile("\n".join(new_code), "<string>", "exec")
|
||||||
break
|
break
|
||||||
|
|
@ -553,7 +566,7 @@ def _compile_code(
|
||||||
if code_o is None:
|
if code_o is None:
|
||||||
raise SyntaxError("Could not compile code")
|
raise SyntaxError("Could not compile code")
|
||||||
|
|
||||||
exec(code_o, globals_dict) # noqa: S102
|
exec(code_o, globals_dict)
|
||||||
return cast(Callable[..., object], globals_dict["fn"])
|
return cast(Callable[..., object], globals_dict["fn"])
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -569,7 +582,7 @@ def chunks(sequence: Iterable[T], size: int) -> Iterable[Iterable[T]]:
|
||||||
yield itertools.chain([item], itertools.islice(iterator, size - 1))
|
yield itertools.chain([item], itertools.islice(iterator, size - 1))
|
||||||
|
|
||||||
|
|
||||||
def hash_record(record: dict[str, Any], keys: Iterable[str] | None = None) -> str:
|
def hash_record(record: Dict[str, Any], keys: Optional[Iterable[str]] = None) -> str:
|
||||||
"""
|
"""
|
||||||
``record`` should be a Python dictionary. Returns a sha1 hash of the
|
``record`` should be a Python dictionary. Returns a sha1 hash of the
|
||||||
keys and values in that record.
|
keys and values in that record.
|
||||||
|
|
@ -590,7 +603,7 @@ def hash_record(record: dict[str, Any], keys: Iterable[str] | None = None) -> st
|
||||||
:param record: Record to generate a hash for
|
:param record: Record to generate a hash for
|
||||||
:param keys: Subset of keys to use for that hash
|
:param keys: Subset of keys to use for that hash
|
||||||
"""
|
"""
|
||||||
to_hash: dict[str, Any] = record
|
to_hash: Dict[str, Any] = record
|
||||||
if keys is not None:
|
if keys is not None:
|
||||||
to_hash = {key: record[key] for key in keys}
|
to_hash = {key: record[key] for key in keys}
|
||||||
return hashlib.sha1(
|
return hashlib.sha1(
|
||||||
|
|
@ -600,7 +613,7 @@ def hash_record(record: dict[str, Any], keys: Iterable[str] | None = None) -> st
|
||||||
).hexdigest()
|
).hexdigest()
|
||||||
|
|
||||||
|
|
||||||
def dedupe_keys(keys: Iterable[str]) -> list[str]:
|
def dedupe_keys(keys: Iterable[str]) -> List[str]:
|
||||||
"""
|
"""
|
||||||
Rename duplicates in a list of column names so every name is unique,
|
Rename duplicates in a list of column names so every name is unique,
|
||||||
by appending ``_2``, ``_3``... to later occurrences - skipping any
|
by appending ``_2``, ``_3``... to later occurrences - skipping any
|
||||||
|
|
@ -623,7 +636,7 @@ def dedupe_keys(keys: Iterable[str]) -> list[str]:
|
||||||
new_key = key
|
new_key = key
|
||||||
suffix = 2
|
suffix = 2
|
||||||
while new_key in seen or new_key in taken:
|
while new_key in seen or new_key in taken:
|
||||||
new_key = f"{key}_{suffix}"
|
new_key = "{}_{}".format(key, suffix)
|
||||||
suffix += 1
|
suffix += 1
|
||||||
key = new_key
|
key = new_key
|
||||||
seen.add(key)
|
seen.add(key)
|
||||||
|
|
@ -631,7 +644,7 @@ def dedupe_keys(keys: Iterable[str]) -> list[str]:
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
def _flatten(d: dict[str, Any]) -> Generator[tuple[str, Any], None, None]:
|
def _flatten(d: Dict[str, Any]) -> Generator[Tuple[str, Any], None, None]:
|
||||||
for key, value in d.items():
|
for key, value in d.items():
|
||||||
if isinstance(value, dict):
|
if isinstance(value, dict):
|
||||||
for key2, value2 in _flatten(value):
|
for key2, value2 in _flatten(value):
|
||||||
|
|
@ -640,7 +653,7 @@ def _flatten(d: dict[str, Any]) -> Generator[tuple[str, Any], None, None]:
|
||||||
yield key, value
|
yield key, value
|
||||||
|
|
||||||
|
|
||||||
def flatten(row: dict[str, Any]) -> dict[str, Any]:
|
def flatten(row: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
"""
|
"""
|
||||||
Turn a nested dict e.g. ``{"a": {"b": 1}}`` into a flat dict: ``{"a_b": 1}``
|
Turn a nested dict e.g. ``{"a": {"b": 1}}`` into a flat dict: ``{"a_b": 1}``
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils import Database
|
from sqlite_utils import Database
|
||||||
from sqlite_utils.utils import sqlite3
|
from sqlite_utils.utils import sqlite3
|
||||||
|
import pytest
|
||||||
|
|
||||||
CREATE_TABLES = """
|
CREATE_TABLES = """
|
||||||
create table Gosh (c1 text, c2 text, c3 text);
|
create table Gosh (c1 text, c2 text, c3 text);
|
||||||
|
|
@ -56,7 +55,7 @@ def close_all_databases():
|
||||||
for db in databases:
|
for db in databases:
|
||||||
try:
|
try:
|
||||||
db.close()
|
db.close()
|
||||||
except sqlite3.Error:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
import sqlite3
|
from sqlite_utils.db import Database, ColumnDetails
|
||||||
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
|
||||||
|
|
||||||
from sqlite_utils import cli
|
from sqlite_utils import cli
|
||||||
from sqlite_utils.db import ColumnDetails, Database
|
from click.testing import CliRunner
|
||||||
|
import pytest
|
||||||
|
import sqlite3
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|
|
||||||
|
|
@ -28,13 +28,11 @@ from sqlite_utils.utils import sqlite3
|
||||||
END;
|
END;
|
||||||
""",
|
""",
|
||||||
[
|
[
|
||||||
(
|
"CREATE TRIGGER t_ai AFTER INSERT ON t\n"
|
||||||
"CREATE TRIGGER t_ai AFTER INSERT ON t\n"
|
" BEGIN\n"
|
||||||
" BEGIN\n"
|
" UPDATE t SET value = 'a;b' WHERE id = new.id;\n"
|
||||||
" UPDATE t SET value = 'a;b' WHERE id = new.id;\n"
|
" INSERT INTO log VALUES ('x;y');\n"
|
||||||
" INSERT INTO log VALUES ('x;y');\n"
|
" END;"
|
||||||
" END;"
|
|
||||||
)
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
@ -51,9 +49,10 @@ def test_atomic_commits(fresh_db):
|
||||||
|
|
||||||
|
|
||||||
def test_atomic_rolls_back(fresh_db):
|
def test_atomic_rolls_back(fresh_db):
|
||||||
with pytest.raises(RuntimeError), fresh_db.atomic():
|
with pytest.raises(RuntimeError):
|
||||||
fresh_db["dogs"].insert({"id": 1, "name": "Cleo"}, pk="id")
|
with fresh_db.atomic():
|
||||||
raise RuntimeError("boom")
|
fresh_db["dogs"].insert({"id": 1, "name": "Cleo"}, pk="id")
|
||||||
|
raise RuntimeError("boom")
|
||||||
|
|
||||||
assert not fresh_db["dogs"].exists()
|
assert not fresh_db["dogs"].exists()
|
||||||
|
|
||||||
|
|
@ -63,9 +62,10 @@ def test_nested_atomic_rolls_back_to_savepoint(fresh_db):
|
||||||
|
|
||||||
with fresh_db.atomic():
|
with fresh_db.atomic():
|
||||||
fresh_db["dogs"].insert({"id": 1, "name": "Cleo"})
|
fresh_db["dogs"].insert({"id": 1, "name": "Cleo"})
|
||||||
with pytest.raises(RuntimeError), fresh_db.atomic():
|
with pytest.raises(RuntimeError):
|
||||||
fresh_db["dogs"].insert({"id": 2, "name": "Pancakes"})
|
with fresh_db.atomic():
|
||||||
raise RuntimeError("boom")
|
fresh_db["dogs"].insert({"id": 2, "name": "Pancakes"})
|
||||||
|
raise RuntimeError("boom")
|
||||||
fresh_db["dogs"].insert({"id": 3, "name": "Marnie"})
|
fresh_db["dogs"].insert({"id": 3, "name": "Marnie"})
|
||||||
|
|
||||||
assert list(fresh_db["dogs"].rows) == [
|
assert list(fresh_db["dogs"].rows) == [
|
||||||
|
|
@ -75,18 +75,20 @@ def test_nested_atomic_rolls_back_to_savepoint(fresh_db):
|
||||||
|
|
||||||
|
|
||||||
def test_outer_atomic_rolls_back_released_savepoint(fresh_db):
|
def test_outer_atomic_rolls_back_released_savepoint(fresh_db):
|
||||||
with pytest.raises(RuntimeError), fresh_db.atomic():
|
with pytest.raises(RuntimeError):
|
||||||
fresh_db["dogs"].insert({"id": 1, "name": "Cleo"}, pk="id")
|
|
||||||
with fresh_db.atomic():
|
with fresh_db.atomic():
|
||||||
fresh_db["dogs"].insert({"id": 2, "name": "Pancakes"})
|
fresh_db["dogs"].insert({"id": 1, "name": "Cleo"}, pk="id")
|
||||||
raise RuntimeError("boom")
|
with fresh_db.atomic():
|
||||||
|
fresh_db["dogs"].insert({"id": 2, "name": "Pancakes"})
|
||||||
|
raise RuntimeError("boom")
|
||||||
|
|
||||||
assert not fresh_db["dogs"].exists()
|
assert not fresh_db["dogs"].exists()
|
||||||
|
|
||||||
|
|
||||||
def test_executescript_does_not_commit_open_atomic_block(fresh_db):
|
def test_executescript_does_not_commit_open_atomic_block(fresh_db):
|
||||||
with pytest.raises(RuntimeError), fresh_db.atomic():
|
with pytest.raises(RuntimeError):
|
||||||
fresh_db.executescript("""
|
with fresh_db.atomic():
|
||||||
|
fresh_db.executescript("""
|
||||||
CREATE TABLE dogs(id INTEGER PRIMARY KEY, name TEXT);
|
CREATE TABLE dogs(id INTEGER PRIMARY KEY, name TEXT);
|
||||||
CREATE TRIGGER dogs_ai AFTER INSERT ON dogs
|
CREATE TRIGGER dogs_ai AFTER INSERT ON dogs
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
@ -95,7 +97,7 @@ def test_executescript_does_not_commit_open_atomic_block(fresh_db):
|
||||||
-- This comment has a semicolon;
|
-- This comment has a semicolon;
|
||||||
INSERT INTO dogs VALUES (1, 'Cleo; the first');
|
INSERT INTO dogs VALUES (1, 'Cleo; the first');
|
||||||
""")
|
""")
|
||||||
raise RuntimeError("boom")
|
raise RuntimeError("boom")
|
||||||
|
|
||||||
assert not fresh_db["dogs"].exists()
|
assert not fresh_db["dogs"].exists()
|
||||||
|
|
||||||
|
|
@ -103,10 +105,11 @@ def test_executescript_does_not_commit_open_atomic_block(fresh_db):
|
||||||
def test_transform_does_not_commit_open_atomic_block(fresh_db):
|
def test_transform_does_not_commit_open_atomic_block(fresh_db):
|
||||||
fresh_db["dogs"].insert({"id": 1, "name": "Cleo", "age": "5"}, pk="id")
|
fresh_db["dogs"].insert({"id": 1, "name": "Cleo", "age": "5"}, pk="id")
|
||||||
|
|
||||||
with pytest.raises(RuntimeError), fresh_db.atomic():
|
with pytest.raises(RuntimeError):
|
||||||
fresh_db["dogs"].insert({"id": 2, "name": "Pancakes", "age": "6"})
|
with fresh_db.atomic():
|
||||||
fresh_db["dogs"].transform(rename={"age": "dog_age"})
|
fresh_db["dogs"].insert({"id": 2, "name": "Pancakes", "age": "6"})
|
||||||
raise RuntimeError("boom")
|
fresh_db["dogs"].transform(rename={"age": "dog_age"})
|
||||||
|
raise RuntimeError("boom")
|
||||||
|
|
||||||
assert (
|
assert (
|
||||||
fresh_db["dogs"].schema
|
fresh_db["dogs"].schema
|
||||||
|
|
@ -146,9 +149,10 @@ def test_transform_parent_table_with_foreign_keys_rolls_back(fresh_db):
|
||||||
foreign_keys={"author_id"},
|
foreign_keys={"author_id"},
|
||||||
)
|
)
|
||||||
|
|
||||||
with pytest.raises(RuntimeError), fresh_db.atomic():
|
with pytest.raises(RuntimeError):
|
||||||
fresh_db["authors"].transform(rename={"name": "full_name"})
|
with fresh_db.atomic():
|
||||||
raise RuntimeError("boom")
|
fresh_db["authors"].transform(rename={"name": "full_name"})
|
||||||
|
raise RuntimeError("boom")
|
||||||
|
|
||||||
assert (
|
assert (
|
||||||
fresh_db["authors"].schema
|
fresh_db["authors"].schema
|
||||||
|
|
@ -350,11 +354,9 @@ def test_atomic_preserves_error_from_transaction_destroying_trigger(fresh_db):
|
||||||
# with "cannot rollback - no transaction is active"
|
# with "cannot rollback - no transaction is active"
|
||||||
fresh_db.execute("create table t (id integer primary key, v text)")
|
fresh_db.execute("create table t (id integer primary key, v text)")
|
||||||
fresh_db.execute(TRIGGER_SQL)
|
fresh_db.execute(TRIGGER_SQL)
|
||||||
with (
|
with pytest.raises(sqlite3.IntegrityError, match="trigger says no"):
|
||||||
pytest.raises(sqlite3.IntegrityError, match="trigger says no"),
|
with fresh_db.atomic():
|
||||||
fresh_db.atomic(),
|
fresh_db.execute("insert into t (v) values ('bad')")
|
||||||
):
|
|
||||||
fresh_db.execute("insert into t (v) values ('bad')")
|
|
||||||
assert not fresh_db.conn.in_transaction
|
assert not fresh_db.conn.in_transaction
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -365,17 +367,16 @@ def test_nested_atomic_preserves_error_from_transaction_destroying_trigger(
|
||||||
# "no such savepoint" from ROLLBACK TO SAVEPOINT
|
# "no such savepoint" from ROLLBACK TO SAVEPOINT
|
||||||
fresh_db.execute("create table t (id integer primary key, v text)")
|
fresh_db.execute("create table t (id integer primary key, v text)")
|
||||||
fresh_db.execute(TRIGGER_SQL)
|
fresh_db.execute(TRIGGER_SQL)
|
||||||
with (
|
with pytest.raises(sqlite3.IntegrityError, match="trigger says no"):
|
||||||
pytest.raises(sqlite3.IntegrityError, match="trigger says no"),
|
with fresh_db.atomic():
|
||||||
fresh_db.atomic(),
|
with fresh_db.atomic():
|
||||||
fresh_db.atomic(),
|
fresh_db.execute("insert into t (v) values ('bad')")
|
||||||
):
|
|
||||||
fresh_db.execute("insert into t (v) values ('bad')")
|
|
||||||
assert not fresh_db.conn.in_transaction
|
assert not fresh_db.conn.in_transaction
|
||||||
|
|
||||||
|
|
||||||
def test_atomic_preserves_error_from_insert_or_rollback(fresh_db):
|
def test_atomic_preserves_error_from_insert_or_rollback(fresh_db):
|
||||||
fresh_db["t"].insert({"id": 1}, pk="id")
|
fresh_db["t"].insert({"id": 1}, pk="id")
|
||||||
with pytest.raises(sqlite3.IntegrityError), fresh_db.atomic():
|
with pytest.raises(sqlite3.IntegrityError):
|
||||||
fresh_db.execute("insert or rollback into t (id) values (1)")
|
with fresh_db.atomic():
|
||||||
|
fresh_db.execute("insert or rollback into t (id) values (1)")
|
||||||
assert not fresh_db.conn.in_transaction
|
assert not fresh_db.conn.in_transaction
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,13 @@
|
||||||
import json
|
from sqlite_utils import cli, Database
|
||||||
import os
|
from sqlite_utils.db import Index, ForeignKey
|
||||||
import sqlite3
|
from click.testing import CliRunner
|
||||||
|
from pathlib import Path
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import textwrap
|
import json
|
||||||
from pathlib import Path
|
import os
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from click.testing import CliRunner
|
import textwrap
|
||||||
|
|
||||||
from sqlite_utils import Database, cli
|
|
||||||
from sqlite_utils.db import ForeignKey, Index
|
|
||||||
|
|
||||||
|
|
||||||
def write_json(file_path, data):
|
def write_json(file_path, data):
|
||||||
|
|
@ -23,7 +20,7 @@ def _supports_pragma_function_list():
|
||||||
try:
|
try:
|
||||||
db.execute("select * from pragma_function_list()")
|
db.execute("select * from pragma_function_list()")
|
||||||
return True
|
return True
|
||||||
except sqlite3.DatabaseError:
|
except Exception:
|
||||||
return False
|
return False
|
||||||
finally:
|
finally:
|
||||||
db.close()
|
db.close()
|
||||||
|
|
@ -186,9 +183,9 @@ def test_output_table(db_path, options, expected):
|
||||||
db["rows"].insert_all(
|
db["rows"].insert_all(
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"c1": f"verb{i}",
|
"c1": "verb{}".format(i),
|
||||||
"c2": f"noun{i}",
|
"c2": "noun{}".format(i),
|
||||||
"c3": f"adjective{i}",
|
"c3": "adjective{}".format(i),
|
||||||
}
|
}
|
||||||
for i in range(4)
|
for i in range(4)
|
||||||
]
|
]
|
||||||
|
|
@ -294,24 +291,6 @@ def test_create_index(db_path):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_drop_index(db_path):
|
|
||||||
db = Database(db_path)
|
|
||||||
db["Gosh"].create_index(["c1"])
|
|
||||||
assert [index.name for index in db["Gosh"].indexes] == ["idx_Gosh_c1"]
|
|
||||||
result = CliRunner().invoke(cli.cli, ["drop-index", db_path, "Gosh", "idx_Gosh_c1"])
|
|
||||||
assert result.exit_code == 0
|
|
||||||
assert db["Gosh"].indexes == []
|
|
||||||
|
|
||||||
result = CliRunner().invoke(cli.cli, ["drop-index", db_path, "Gosh", "idx_Gosh_c1"])
|
|
||||||
assert result.exit_code == 1
|
|
||||||
assert "No index named idx_Gosh_c1" in result.output
|
|
||||||
|
|
||||||
result = CliRunner().invoke(
|
|
||||||
cli.cli, ["drop-index", db_path, "Gosh", "idx_Gosh_c1", "--ignore"]
|
|
||||||
)
|
|
||||||
assert result.exit_code == 0
|
|
||||||
|
|
||||||
|
|
||||||
def test_create_index_analyze(db_path):
|
def test_create_index_analyze(db_path):
|
||||||
db = Database(db_path)
|
db = Database(db_path)
|
||||||
assert "sqlite_stat1" not in db.table_names()
|
assert "sqlite_stat1" not in db.table_names()
|
||||||
|
|
@ -680,9 +659,9 @@ def test_optimize(db_path, tables):
|
||||||
db[table].insert_all(
|
db[table].insert_all(
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"c1": f"verb{i}",
|
"c1": "verb{}".format(i),
|
||||||
"c2": f"noun{i}",
|
"c2": "noun{}".format(i),
|
||||||
"c3": f"adjective{i}",
|
"c3": "adjective{}".format(i),
|
||||||
}
|
}
|
||||||
for i in range(10000)
|
for i in range(10000)
|
||||||
]
|
]
|
||||||
|
|
@ -706,9 +685,9 @@ def test_rebuild_fts_fixes_docsize_error(db_path):
|
||||||
db = Database(db_path, recursive_triggers=False)
|
db = Database(db_path, recursive_triggers=False)
|
||||||
records = [
|
records = [
|
||||||
{
|
{
|
||||||
"c1": f"verb{i}",
|
"c1": "verb{}".format(i),
|
||||||
"c2": f"noun{i}",
|
"c2": "noun{}".format(i),
|
||||||
"c3": f"adjective{i}",
|
"c3": "adjective{}".format(i),
|
||||||
}
|
}
|
||||||
for i in range(10000)
|
for i in range(10000)
|
||||||
]
|
]
|
||||||
|
|
@ -1021,14 +1000,16 @@ def test_query_json_binary(db_path):
|
||||||
"data": {
|
"data": {
|
||||||
"$base64": True,
|
"$base64": True,
|
||||||
"encoded": (
|
"encoded": (
|
||||||
"eJzt0c1xAyEMBeC7q1ABHleR3HxNAQrIjmb4M0gelx+RTY7p4N2WBYT0vmufUknH"
|
(
|
||||||
"8kq5lz5pqRFXsTOl3pYkE/NJnHXoStruJEVjc0mOCyTqq/ZMJnXEZW1Js2ZvRm5U+"
|
"eJzt0c1xAyEMBeC7q1ABHleR3HxNAQrIjmb4M0gelx+RTY7p4N2WBYT0vmufUknH"
|
||||||
"DPKk9hRWqjyvTFx0YfzhT6MpGmN2lR1fzxjyfVMD9dFrS+bnkleMpMam/ZGXgrX1I"
|
"8kq5lz5pqRFXsTOl3pYkE/NJnHXoStruJEVjc0mOCyTqq/ZMJnXEZW1Js2ZvRm5U+"
|
||||||
"/K+5Au3S/9lNQRh0k4Gq/RUz8GiKfsQm+7JLsJ6fTo5JhVG00ZU76kZZkxePx49uI"
|
"DPKk9hRWqjyvTFx0YfzhT6MpGmN2lR1fzxjyfVMD9dFrS+bnkleMpMam/ZGXgrX1I"
|
||||||
"jnpNoJyYlWUsoaSl/CcVATje/Kxu13RANnrHweaH3V5Jh4jvGyKCnxJLiXPKhmW3f"
|
"/K+5Au3S/9lNQRh0k4Gq/RUz8GiKfsQm+7JLsJ6fTo5JhVG00ZU76kZZkxePx49uI"
|
||||||
"iCnG7Jql7RR3UvFo8jJ4z039dtOkTFmWzL1be9lt8A5II471m6vXy+l0BR/4wAc+8"
|
"jnpNoJyYlWUsoaSl/CcVATje/Kxu13RANnrHweaH3V5Jh4jvGyKCnxJLiXPKhmW3f"
|
||||||
"IEPfOADH/jABz7wgQ984AMf+MAHPvCBD3zgAx/4wAc+8IEPfOADH/jABz7wgQ984A"
|
"iCnG7Jql7RR3UvFo8jJ4z039dtOkTFmWzL1be9lt8A5II471m6vXy+l0BR/4wAc+8"
|
||||||
"Mf+MAHPvCBD3zgAx/4wAc+8IEPfOADH/jABz7wgQ984PuP7xubBoN9"
|
"IEPfOADH/jABz7wgQ984AMf+MAHPvCBD3zgAx/4wAc+8IEPfOADH/jABz7wgQ984A"
|
||||||
|
"Mf+MAHPvCBD3zgAx/4wAc+8IEPfOADH/jABz7wgQ984PuP7xubBoN9"
|
||||||
|
)
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
@ -1940,64 +1921,6 @@ def test_transform_sql(db_path):
|
||||||
assert db["dogs"].schema == original_schema
|
assert db["dogs"].schema == original_schema
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
|
||||||
"initial_strict,args,expected_strict",
|
|
||||||
(
|
|
||||||
(False, [], False),
|
|
||||||
(True, [], True),
|
|
||||||
(False, ["--strict"], True),
|
|
||||||
(True, ["--no-strict"], False),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
def test_transform_strict_option(db_path, initial_strict, args, expected_strict):
|
|
||||||
db = Database(db_path)
|
|
||||||
if not db.supports_strict:
|
|
||||||
pytest.skip("SQLite version does not support strict tables")
|
|
||||||
db["dogs"].create({"id": int}, strict=initial_strict)
|
|
||||||
|
|
||||||
result = CliRunner().invoke(cli.cli, ["transform", db_path, "dogs"] + args)
|
|
||||||
|
|
||||||
assert result.exit_code == 0, result.output
|
|
||||||
assert db["dogs"].strict is expected_strict
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
|
||||||
"initial_strict,flag,sql_is_strict",
|
|
||||||
(
|
|
||||||
(False, "--strict", True),
|
|
||||||
(True, "--no-strict", False),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
def test_transform_strict_option_sql(db_path, initial_strict, flag, sql_is_strict):
|
|
||||||
db = Database(db_path)
|
|
||||||
if not db.supports_strict:
|
|
||||||
pytest.skip("SQLite version does not support strict tables")
|
|
||||||
db["dogs"].create({"id": int}, strict=initial_strict)
|
|
||||||
|
|
||||||
result = CliRunner().invoke(cli.cli, ["transform", db_path, "dogs", flag, "--sql"])
|
|
||||||
|
|
||||||
assert result.exit_code == 0, result.output
|
|
||||||
assert (") STRICT;" in result.output) is sql_is_strict
|
|
||||||
assert db["dogs"].strict is initial_strict
|
|
||||||
|
|
||||||
|
|
||||||
def test_transform_strict_option_with_invalid_data(db_path):
|
|
||||||
db = Database(db_path)
|
|
||||||
if not db.supports_strict:
|
|
||||||
pytest.skip("SQLite version does not support strict tables")
|
|
||||||
dogs = db["dogs"]
|
|
||||||
dogs.create({"id": int})
|
|
||||||
dogs.insert({"id": "not-an-integer"})
|
|
||||||
|
|
||||||
result = CliRunner().invoke(cli.cli, ["transform", db_path, "dogs", "--strict"])
|
|
||||||
|
|
||||||
assert result.exit_code == 1
|
|
||||||
assert isinstance(result.exception, sqlite3.IntegrityError)
|
|
||||||
assert dogs.strict is False
|
|
||||||
assert list(dogs.rows) == [{"id": "not-an-integer"}]
|
|
||||||
assert not any(name.startswith("dogs_new_") for name in db.table_names())
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"extra_args,expected_schema",
|
"extra_args,expected_schema",
|
||||||
(
|
(
|
||||||
|
|
@ -2114,13 +2037,11 @@ _common_other_schema = (
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
["--rename", "name", "name2"],
|
["--rename", "name", "name2"],
|
||||||
(
|
'CREATE TABLE "trees" (\n'
|
||||||
'CREATE TABLE "trees" (\n'
|
' "id" INTEGER PRIMARY KEY,\n'
|
||||||
' "id" INTEGER PRIMARY KEY,\n'
|
' "address" TEXT,\n'
|
||||||
' "address" TEXT,\n'
|
' "species_id" INTEGER REFERENCES "species"("id")\n'
|
||||||
' "species_id" INTEGER REFERENCES "species"("id")\n'
|
")",
|
||||||
")"
|
|
||||||
),
|
|
||||||
'CREATE TABLE "species" (\n "id" INTEGER PRIMARY KEY,\n "species" TEXT\n)',
|
'CREATE TABLE "species" (\n "id" INTEGER PRIMARY KEY,\n "species" TEXT\n)',
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|
@ -2139,9 +2060,9 @@ def test_extract(db_path, args, expected_table_schema, expected_other_schema):
|
||||||
assert result.exit_code == 0
|
assert result.exit_code == 0
|
||||||
schema = db["trees"].schema
|
schema = db["trees"].schema
|
||||||
assert schema == expected_table_schema
|
assert schema == expected_table_schema
|
||||||
other_schema = next(
|
other_schema = [t for t in db.tables if t.name not in ("trees", "Gosh", "Gosh2")][
|
||||||
t for t in db.tables if t.name not in ("trees", "Gosh", "Gosh2")
|
0
|
||||||
).schema
|
].schema
|
||||||
assert other_schema == expected_other_schema
|
assert other_schema == expected_other_schema
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -2433,7 +2354,7 @@ def test_long_csv_column_value(tmpdir):
|
||||||
with open(csv_path, "w") as csv_file:
|
with open(csv_path, "w") as csv_file:
|
||||||
long_string = "a" * 131073
|
long_string = "a" * 131073
|
||||||
csv_file.write("id,text\n")
|
csv_file.write("id,text\n")
|
||||||
csv_file.write(f"1,{long_string}\n")
|
csv_file.write("1,{}\n".format(long_string))
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["insert", db_path, "bigtable", csv_path, "--csv"],
|
["insert", db_path, "bigtable", csv_path, "--csv"],
|
||||||
|
|
@ -2459,8 +2380,8 @@ def test_import_no_headers(tmpdir, args, tsv):
|
||||||
csv_path = str(tmpdir / "test.csv")
|
csv_path = str(tmpdir / "test.csv")
|
||||||
with open(csv_path, "w") as csv_file:
|
with open(csv_path, "w") as csv_file:
|
||||||
sep = "\t" if tsv else ","
|
sep = "\t" if tsv else ","
|
||||||
csv_file.write(f"Cleo{sep}Dog{sep}5\n")
|
csv_file.write("Cleo{sep}Dog{sep}5\n".format(sep=sep))
|
||||||
csv_file.write(f"Tracy{sep}Spider{sep}7\n")
|
csv_file.write("Tracy{sep}Spider{sep}7\n".format(sep=sep))
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["insert", db_path, "creatures", csv_path] + args + ["--no-detect-types"],
|
["insert", db_path, "creatures", csv_path] + args + ["--no-detect-types"],
|
||||||
|
|
@ -2692,9 +2613,7 @@ def test_integer_overflow_error(tmpdir):
|
||||||
def test_python_dash_m():
|
def test_python_dash_m():
|
||||||
"Tool can be run using python -m sqlite_utils"
|
"Tool can be run using python -m sqlite_utils"
|
||||||
result = subprocess.run(
|
result = subprocess.run(
|
||||||
[sys.executable, "-m", "sqlite_utils", "--help"],
|
[sys.executable, "-m", "sqlite_utils", "--help"], stdout=subprocess.PIPE
|
||||||
stdout=subprocess.PIPE,
|
|
||||||
check=False,
|
|
||||||
)
|
)
|
||||||
assert result.returncode == 0
|
assert result.returncode == 0
|
||||||
assert b"Commands for interacting with a SQLite database" in result.stdout
|
assert b"Commands for interacting with a SQLite database" in result.stdout
|
||||||
|
|
@ -2834,14 +2753,14 @@ def test_load_extension(entrypoint, should_pass, should_fail):
|
||||||
for func in should_pass:
|
for func in should_pass:
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["memory", f"select {func}()", "--load-extension", ext],
|
["memory", "select {}()".format(func), "--load-extension", ext],
|
||||||
catch_exceptions=False,
|
catch_exceptions=False,
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0
|
assert result.exit_code == 0
|
||||||
for func in should_fail:
|
for func in should_fail:
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["memory", f"select {func}()", "--load-extension", ext],
|
["memory", "select {}()".format(func), "--load-extension", ext],
|
||||||
catch_exceptions=False,
|
catch_exceptions=False,
|
||||||
)
|
)
|
||||||
assert result.exit_code == 1
|
assert result.exit_code == 1
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
||||||
|
from click.testing import CliRunner
|
||||||
|
from sqlite_utils import cli, Database
|
||||||
import pathlib
|
import pathlib
|
||||||
|
import pytest
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
|
||||||
|
|
||||||
from sqlite_utils import Database, cli
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def test_db_and_path(tmpdir):
|
def test_db_and_path(tmpdir):
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,10 @@
|
||||||
import json
|
|
||||||
import pathlib
|
|
||||||
import textwrap
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
|
||||||
import sqlite_utils
|
|
||||||
from sqlite_utils import cli
|
from sqlite_utils import cli
|
||||||
|
import sqlite_utils
|
||||||
|
import json
|
||||||
|
import textwrap
|
||||||
|
import pathlib
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|
@ -52,7 +50,7 @@ def test_convert_code(fresh_db_and_path, code):
|
||||||
cli.cli, ["convert", db_path, "t", "text", code], catch_exceptions=False
|
cli.cli, ["convert", db_path, "t", "text", code], catch_exceptions=False
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0, result.output
|
assert result.exit_code == 0, result.output
|
||||||
value = next(iter(db["t"].rows))["text"]
|
value = list(db["t"].rows)[0]["text"]
|
||||||
assert value == "Spooktober"
|
assert value == "Spooktober"
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -444,7 +442,7 @@ def test_recipe_jsonsplit(tmpdir, delimiter):
|
||||||
)
|
)
|
||||||
code = "r.jsonsplit(value)"
|
code = "r.jsonsplit(value)"
|
||||||
if delimiter:
|
if delimiter:
|
||||||
code = f'recipes.jsonsplit(value, delimiter="{delimiter}")'
|
code = 'recipes.jsonsplit(value, delimiter="{}")'.format(delimiter)
|
||||||
args = ["convert", db_path, "example", "tags", code]
|
args = ["convert", db_path, "example", "tags", code]
|
||||||
result = CliRunner().invoke(cli.cli, args)
|
result = CliRunner().invoke(cli.cli, args)
|
||||||
assert result.exit_code == 0, result.output
|
assert result.exit_code == 0, result.output
|
||||||
|
|
@ -472,7 +470,7 @@ def test_recipe_jsonsplit_type(fresh_db_and_path, type, expected_array):
|
||||||
)
|
)
|
||||||
code = "r.jsonsplit(value)"
|
code = "r.jsonsplit(value)"
|
||||||
if type:
|
if type:
|
||||||
code = f"recipes.jsonsplit(value, type={type})"
|
code = "recipes.jsonsplit(value, type={})".format(type)
|
||||||
args = ["convert", db_path, "example", "records", code]
|
args = ["convert", db_path, "example", "records", code]
|
||||||
result = CliRunner().invoke(cli.cli, args)
|
result = CliRunner().invoke(cli.cli, args)
|
||||||
assert result.exit_code == 0, result.output
|
assert result.exit_code == 0, result.output
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
||||||
|
from sqlite_utils import cli, Database
|
||||||
|
from click.testing import CliRunner
|
||||||
import json
|
import json
|
||||||
|
import pytest
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
|
||||||
|
|
||||||
from sqlite_utils import Database, cli
|
|
||||||
|
|
||||||
|
|
||||||
def test_insert_simple(tmpdir):
|
def test_insert_simple(tmpdir):
|
||||||
json_path = str(tmpdir / "dog.json")
|
json_path = str(tmpdir / "dog.json")
|
||||||
|
|
@ -101,7 +99,7 @@ def test_insert_with_primary_keys(db_path, tmpdir, args, expected_pks):
|
||||||
|
|
||||||
def test_insert_multiple_with_primary_key(db_path, tmpdir):
|
def test_insert_multiple_with_primary_key(db_path, tmpdir):
|
||||||
json_path = str(tmpdir / "dogs.json")
|
json_path = str(tmpdir / "dogs.json")
|
||||||
dogs = [{"id": i, "name": f"Cleo {i}", "age": i + 3} for i in range(1, 21)]
|
dogs = [{"id": i, "name": "Cleo {}".format(i), "age": i + 3} for i in range(1, 21)]
|
||||||
with open(json_path, "w") as fp:
|
with open(json_path, "w") as fp:
|
||||||
fp.write(json.dumps(dogs))
|
fp.write(json.dumps(dogs))
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
|
|
@ -116,7 +114,7 @@ def test_insert_multiple_with_primary_key(db_path, tmpdir):
|
||||||
def test_insert_multiple_with_compound_primary_key(db_path, tmpdir):
|
def test_insert_multiple_with_compound_primary_key(db_path, tmpdir):
|
||||||
json_path = str(tmpdir / "dogs.json")
|
json_path = str(tmpdir / "dogs.json")
|
||||||
dogs = [
|
dogs = [
|
||||||
{"breed": "mixed", "id": i, "name": f"Cleo {i}", "age": i + 3}
|
{"breed": "mixed", "id": i, "name": "Cleo {}".format(i), "age": i + 3}
|
||||||
for i in range(1, 21)
|
for i in range(1, 21)
|
||||||
]
|
]
|
||||||
with open(json_path, "w") as fp:
|
with open(json_path, "w") as fp:
|
||||||
|
|
@ -142,7 +140,8 @@ def test_insert_multiple_with_compound_primary_key(db_path, tmpdir):
|
||||||
def test_insert_not_null_default(db_path, tmpdir):
|
def test_insert_not_null_default(db_path, tmpdir):
|
||||||
json_path = str(tmpdir / "dogs.json")
|
json_path = str(tmpdir / "dogs.json")
|
||||||
dogs = [
|
dogs = [
|
||||||
{"id": i, "name": f"Cleo {i}", "age": i + 3, "score": 10} for i in range(1, 21)
|
{"id": i, "name": "Cleo {}".format(i), "age": i + 3, "score": 10}
|
||||||
|
for i in range(1, 21)
|
||||||
]
|
]
|
||||||
with open(json_path, "w") as fp:
|
with open(json_path, "w") as fp:
|
||||||
fp.write(json.dumps(dogs))
|
fp.write(json.dumps(dogs))
|
||||||
|
|
@ -588,7 +587,7 @@ def test_insert_streaming_batch_size_1(db_path):
|
||||||
return
|
return
|
||||||
tries += 1
|
tries += 1
|
||||||
if tries > 10:
|
if tries > 10:
|
||||||
assert False, f"Expected {expected}, got {rows}"
|
assert False, "Expected {}, got {}".format(expected, rows)
|
||||||
time.sleep(tries * 0.1)
|
time.sleep(tries * 0.1)
|
||||||
|
|
||||||
try_until([{"name": "Azi"}])
|
try_until([{"name": "Azi"}])
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import json
|
|
||||||
|
|
||||||
import click
|
import click
|
||||||
|
import json
|
||||||
import pytest
|
import pytest
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
|
||||||
|
|
@ -29,7 +28,7 @@ def test_memory_csv(tmpdir, sql_from, use_stdin):
|
||||||
fp.write(content)
|
fp.write(content)
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["memory", csv_path, f"select * from {sql_from}", "--nl"],
|
["memory", csv_path, "select * from {}".format(sql_from), "--nl"],
|
||||||
input=input,
|
input=input,
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0
|
assert result.exit_code == 0
|
||||||
|
|
@ -54,7 +53,7 @@ def test_memory_tsv(tmpdir, use_stdin):
|
||||||
sql_from = "chickens"
|
sql_from = "chickens"
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["memory", path, f"select * from {sql_from}"],
|
["memory", path, "select * from {}".format(sql_from)],
|
||||||
input=input,
|
input=input,
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0, result.output
|
assert result.exit_code == 0, result.output
|
||||||
|
|
@ -80,7 +79,7 @@ def test_memory_json(tmpdir, use_stdin):
|
||||||
sql_from = "chickens"
|
sql_from = "chickens"
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["memory", path, f"select * from {sql_from}"],
|
["memory", path, "select * from {}".format(sql_from)],
|
||||||
input=input,
|
input=input,
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0, result.output
|
assert result.exit_code == 0, result.output
|
||||||
|
|
@ -106,7 +105,7 @@ def test_memory_json_nl(tmpdir, use_stdin):
|
||||||
sql_from = "chickens"
|
sql_from = "chickens"
|
||||||
result = CliRunner().invoke(
|
result = CliRunner().invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["memory", path, f"select * from {sql_from}"],
|
["memory", path, "select * from {}".format(sql_from)],
|
||||||
input=input,
|
input=input,
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0, result.output
|
assert result.exit_code == 0, result.output
|
||||||
|
|
@ -136,7 +135,7 @@ def test_memory_csv_encoding(tmpdir, use_stdin):
|
||||||
CliRunner()
|
CliRunner()
|
||||||
.invoke(
|
.invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["memory", csv_path, f"select * from {sql_from}", "--nl"],
|
["memory", csv_path, "select * from {}".format(sql_from), "--nl"],
|
||||||
input=input,
|
input=input,
|
||||||
)
|
)
|
||||||
.exit_code
|
.exit_code
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
import pathlib
|
import pathlib
|
||||||
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
import pytest
|
||||||
import sqlite_utils
|
import sqlite_utils
|
||||||
import sqlite_utils.cli
|
import sqlite_utils.cli
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils.utils import column_affinity
|
from sqlite_utils.utils import column_affinity
|
||||||
|
|
||||||
EXAMPLES = [
|
EXAMPLES = [
|
||||||
|
|
@ -42,5 +41,5 @@ def test_column_affinity(column_def, expected_type):
|
||||||
|
|
||||||
@pytest.mark.parametrize("column_def,expected_type", EXAMPLES)
|
@pytest.mark.parametrize("column_def,expected_type", EXAMPLES)
|
||||||
def test_columns_dict(fresh_db, column_def, expected_type):
|
def test_columns_dict(fresh_db, column_def, expected_type):
|
||||||
fresh_db.execute(f"create table foo (col {column_def})")
|
fresh_db.execute("create table foo (col {})".format(column_def))
|
||||||
assert {"col": expected_type} == fresh_db["foo"].columns_dict
|
assert {"col": expected_type} == fresh_db["foo"].columns_dict
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
import sys
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils import Database
|
from sqlite_utils import Database
|
||||||
from sqlite_utils.db import TransactionError
|
from sqlite_utils.db import TransactionError
|
||||||
from sqlite_utils.utils import sqlite3
|
from sqlite_utils.utils import sqlite3
|
||||||
|
import pytest
|
||||||
|
import sys
|
||||||
|
|
||||||
|
|
||||||
def test_recursive_triggers():
|
def test_recursive_triggers():
|
||||||
|
|
@ -63,6 +61,37 @@ def test_database_close(tmpdir, memory):
|
||||||
db.execute("select 1 + 1")
|
db.execute("select 1 + 1")
|
||||||
|
|
||||||
|
|
||||||
|
def test_memory_attribute_for_memory_true():
|
||||||
|
db = Database(memory=True)
|
||||||
|
assert db.memory is True
|
||||||
|
assert db.memory_name is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_memory_attribute_for_memory_name():
|
||||||
|
db = Database(memory_name="shared_attr")
|
||||||
|
assert db.memory is True
|
||||||
|
assert db.memory_name == "shared_attr"
|
||||||
|
|
||||||
|
|
||||||
|
def test_memory_attribute_for_memory_string_path():
|
||||||
|
db = Database(":memory:")
|
||||||
|
assert db.memory is True
|
||||||
|
assert db.memory_name is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_memory_attribute_for_file_path(tmpdir):
|
||||||
|
db = Database(str(tmpdir / "file.db"))
|
||||||
|
assert db.memory is False
|
||||||
|
assert db.memory_name is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_memory_attribute_for_existing_connection():
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
db = Database(conn)
|
||||||
|
assert db.memory is False
|
||||||
|
assert db.memory_name is None
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(
|
@pytest.mark.skipif(
|
||||||
sys.version_info < (3, 12),
|
sys.version_info < (3, 12),
|
||||||
reason="sqlite3.connect(autocommit=) requires Python 3.12",
|
reason="sqlite3.connect(autocommit=) requires Python 3.12",
|
||||||
|
|
@ -89,27 +118,3 @@ def test_legacy_transaction_control_connection_is_accepted(tmpdir):
|
||||||
db["t"].insert({"id": 1}, pk="id")
|
db["t"].insert({"id": 1}, pk="id")
|
||||||
assert [r["id"] for r in db["t"].rows] == [1]
|
assert [r["id"] for r in db["t"].rows] == [1]
|
||||||
db.close()
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
def test_memory_attribute_for_memory_true():
|
|
||||||
db = Database(memory=True)
|
|
||||||
assert db.memory is True
|
|
||||||
assert db.memory_name is None
|
|
||||||
|
|
||||||
|
|
||||||
def test_memory_attribute_for_memory_name():
|
|
||||||
db = Database(memory_name="shared_attr")
|
|
||||||
assert db.memory is True
|
|
||||||
assert db.memory_name == "shared_attr"
|
|
||||||
|
|
||||||
|
|
||||||
def test_memory_attribute_for_memory_string_path():
|
|
||||||
db = Database(":memory:")
|
|
||||||
assert db.memory is True
|
|
||||||
assert db.memory_name is None
|
|
||||||
|
|
||||||
|
|
||||||
def test_memory_attribute_for_file_path(tmpdir):
|
|
||||||
db = Database(str(tmpdir / "file.db"))
|
|
||||||
assert db.memory is False
|
|
||||||
assert db.memory_name is None
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils.db import BadMultiValues
|
from sqlite_utils.db import BadMultiValues
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,25 @@
|
||||||
|
from sqlite_utils.db import (
|
||||||
|
Index,
|
||||||
|
Database,
|
||||||
|
DescIndex,
|
||||||
|
AlterError,
|
||||||
|
InvalidColumns,
|
||||||
|
NoObviousTable,
|
||||||
|
OperationalError,
|
||||||
|
ForeignKey,
|
||||||
|
Table,
|
||||||
|
View,
|
||||||
|
NoTable,
|
||||||
|
NoView,
|
||||||
|
)
|
||||||
|
from sqlite_utils.utils import hash_record, sqlite3
|
||||||
import collections
|
import collections
|
||||||
import datetime
|
import datetime
|
||||||
import decimal
|
import decimal
|
||||||
import json
|
import json
|
||||||
import pathlib
|
import pathlib
|
||||||
import uuid
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
import uuid
|
||||||
from sqlite_utils.db import (
|
|
||||||
AlterError,
|
|
||||||
Database,
|
|
||||||
DescIndex,
|
|
||||||
ForeignKey,
|
|
||||||
Index,
|
|
||||||
InvalidColumns,
|
|
||||||
NoObviousTable,
|
|
||||||
NoTable,
|
|
||||||
NoView,
|
|
||||||
OperationalError,
|
|
||||||
Table,
|
|
||||||
View,
|
|
||||||
)
|
|
||||||
from sqlite_utils.utils import hash_record, sqlite3
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import pandas as pd # type: ignore
|
import pandas as pd # type: ignore
|
||||||
|
|
@ -701,7 +699,7 @@ def test_bulk_insert_more_than_999_values(fresh_db):
|
||||||
"num_columns,should_error", ((900, False), (999, False), (1000, True))
|
"num_columns,should_error", ((900, False), (999, False), (1000, True))
|
||||||
)
|
)
|
||||||
def test_error_if_more_than_999_columns(fresh_db, num_columns, should_error):
|
def test_error_if_more_than_999_columns(fresh_db, num_columns, should_error):
|
||||||
record = {f"c{i}": i for i in range(num_columns)}
|
record = dict([("c{}".format(i), i) for i in range(num_columns)])
|
||||||
if should_error:
|
if should_error:
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
fresh_db["big"].insert(record)
|
fresh_db["big"].insert(record)
|
||||||
|
|
@ -720,9 +718,17 @@ def test_columns_not_in_first_record_should_not_cause_batch_to_be_too_large(fres
|
||||||
records = [
|
records = [
|
||||||
{"c0": "first record"}, # one column in first record -> batch size = 999
|
{"c0": "first record"}, # one column in first record -> batch size = 999
|
||||||
# fill out the batch with 99 records with enough columns to exceed THRESHOLD
|
# fill out the batch with 99 records with enough columns to exceed THRESHOLD
|
||||||
*[{f"c{i}": j for i in range(extra_columns)} for j in range(batch_size - 1)],
|
*[
|
||||||
|
dict([("c{}".format(i), j) for i in range(extra_columns)])
|
||||||
|
for j in range(batch_size - 1)
|
||||||
|
],
|
||||||
]
|
]
|
||||||
fresh_db["too_many_columns"].insert_all(records, alter=True, batch_size=batch_size)
|
try:
|
||||||
|
fresh_db["too_many_columns"].insert_all(
|
||||||
|
records, alter=True, batch_size=batch_size
|
||||||
|
)
|
||||||
|
except sqlite3.OperationalError:
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
|
|
@ -803,34 +809,6 @@ def test_create_index_if_not_exists(fresh_db):
|
||||||
dogs.create_index(["name"], if_not_exists=True)
|
dogs.create_index(["name"], if_not_exists=True)
|
||||||
|
|
||||||
|
|
||||||
def test_drop_index(fresh_db):
|
|
||||||
dogs = fresh_db["dogs"]
|
|
||||||
dogs.insert({"name": "Cleo", "twitter": "cleopaws", "age": 3, "is_good_dog": True})
|
|
||||||
dogs.create_index(["name"])
|
|
||||||
assert [index.name for index in dogs.indexes] == ["idx_dogs_name"]
|
|
||||||
dogs.drop_index("idx_dogs_name")
|
|
||||||
assert dogs.indexes == []
|
|
||||||
|
|
||||||
|
|
||||||
def test_drop_index_ignore(fresh_db):
|
|
||||||
dogs = fresh_db["dogs"]
|
|
||||||
dogs.insert({"name": "Cleo"})
|
|
||||||
with pytest.raises(OperationalError, match="No index named idx_dogs_name"):
|
|
||||||
dogs.drop_index("idx_dogs_name")
|
|
||||||
dogs.drop_index("idx_dogs_name", ignore=True)
|
|
||||||
|
|
||||||
|
|
||||||
def test_drop_index_wrong_table(fresh_db):
|
|
||||||
dogs = fresh_db["dogs"]
|
|
||||||
cats = fresh_db["cats"]
|
|
||||||
dogs.insert({"name": "Cleo"})
|
|
||||||
cats.insert({"name": "Misty"})
|
|
||||||
dogs.create_index(["name"])
|
|
||||||
with pytest.raises(OperationalError, match="No index named idx_dogs_name"):
|
|
||||||
cats.drop_index("idx_dogs_name")
|
|
||||||
assert [index.name for index in dogs.indexes] == ["idx_dogs_name"]
|
|
||||||
|
|
||||||
|
|
||||||
def test_create_index_desc(fresh_db):
|
def test_create_index_desc(fresh_db):
|
||||||
dogs = fresh_db["dogs"]
|
dogs = fresh_db["dogs"]
|
||||||
dogs.insert({"name": "Cleo", "twitter": "cleopaws", "age": 3, "is good dog": True})
|
dogs.insert({"name": "Cleo", "twitter": "cleopaws", "age": 3, "is good dog": True})
|
||||||
|
|
@ -904,7 +882,7 @@ def test_insert_list_nested_unicode(fresh_db):
|
||||||
def test_insert_uuid(fresh_db):
|
def test_insert_uuid(fresh_db):
|
||||||
uuid4 = uuid.uuid4()
|
uuid4 = uuid.uuid4()
|
||||||
fresh_db["test"].insert({"uuid": uuid4})
|
fresh_db["test"].insert({"uuid": uuid4})
|
||||||
row = next(iter(fresh_db["test"].rows))
|
row = list(fresh_db["test"].rows)[0]
|
||||||
assert {"uuid"} == row.keys()
|
assert {"uuid"} == row.keys()
|
||||||
assert isinstance(row["uuid"], str)
|
assert isinstance(row["uuid"], str)
|
||||||
assert row["uuid"] == str(uuid4)
|
assert row["uuid"] == str(uuid4)
|
||||||
|
|
@ -912,14 +890,16 @@ def test_insert_uuid(fresh_db):
|
||||||
|
|
||||||
def test_insert_memoryview(fresh_db):
|
def test_insert_memoryview(fresh_db):
|
||||||
fresh_db["test"].insert({"data": memoryview(b"hello")})
|
fresh_db["test"].insert({"data": memoryview(b"hello")})
|
||||||
row = next(iter(fresh_db["test"].rows))
|
row = list(fresh_db["test"].rows)[0]
|
||||||
assert {"data"} == row.keys()
|
assert {"data"} == row.keys()
|
||||||
assert isinstance(row["data"], bytes)
|
assert isinstance(row["data"], bytes)
|
||||||
assert row["data"] == b"hello"
|
assert row["data"] == b"hello"
|
||||||
|
|
||||||
|
|
||||||
def test_insert_thousands_using_generator(fresh_db):
|
def test_insert_thousands_using_generator(fresh_db):
|
||||||
fresh_db["test"].insert_all({"i": i, "word": f"word_{i}"} for i in range(10000))
|
fresh_db["test"].insert_all(
|
||||||
|
{"i": i, "word": "word_{}".format(i)} for i in range(10000)
|
||||||
|
)
|
||||||
assert [{"name": "i", "type": "INTEGER"}, {"name": "word", "type": "TEXT"}] == [
|
assert [{"name": "i", "type": "INTEGER"}, {"name": "word", "type": "TEXT"}] == [
|
||||||
{"name": col.name, "type": col.type} for col in fresh_db["test"].columns
|
{"name": col.name, "type": col.type} for col in fresh_db["test"].columns
|
||||||
]
|
]
|
||||||
|
|
@ -930,7 +910,7 @@ def test_insert_thousands_raises_exception_with_extra_columns_after_first_100(fr
|
||||||
# https://github.com/simonw/sqlite-utils/issues/139
|
# https://github.com/simonw/sqlite-utils/issues/139
|
||||||
with pytest.raises(Exception, match="table test has no column named extra"):
|
with pytest.raises(Exception, match="table test has no column named extra"):
|
||||||
fresh_db["test"].insert_all(
|
fresh_db["test"].insert_all(
|
||||||
[{"i": i, "word": f"word_{i}"} for i in range(100)]
|
[{"i": i, "word": "word_{}".format(i)} for i in range(100)]
|
||||||
+ [{"i": 101, "extra": "This extra column should cause an exception"}],
|
+ [{"i": 101, "extra": "This extra column should cause an exception"}],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -938,7 +918,7 @@ def test_insert_thousands_raises_exception_with_extra_columns_after_first_100(fr
|
||||||
def test_insert_thousands_adds_extra_columns_after_first_100_with_alter(fresh_db):
|
def test_insert_thousands_adds_extra_columns_after_first_100_with_alter(fresh_db):
|
||||||
# https://github.com/simonw/sqlite-utils/issues/139
|
# https://github.com/simonw/sqlite-utils/issues/139
|
||||||
fresh_db["test"].insert_all(
|
fresh_db["test"].insert_all(
|
||||||
[{"i": i, "word": f"word_{i}"} for i in range(100)]
|
[{"i": i, "word": "word_{}".format(i)} for i in range(100)]
|
||||||
+ [{"i": 101, "extra": "Should trigger ALTER"}],
|
+ [{"i": 101, "extra": "Should trigger ALTER"}],
|
||||||
alter=True,
|
alter=True,
|
||||||
)
|
)
|
||||||
|
|
@ -950,7 +930,7 @@ def test_insert_thousands_adds_extra_columns_after_first_100_with_alter(fresh_db
|
||||||
def test_insert_all_pk_not_in_records_raises(fresh_db, num_rows):
|
def test_insert_all_pk_not_in_records_raises(fresh_db, num_rows):
|
||||||
# https://github.com/simonw/sqlite-utils/issues/732
|
# https://github.com/simonw/sqlite-utils/issues/732
|
||||||
fresh_db.conn.execute("CREATE TABLE t (a TEXT, b INT, PRIMARY KEY (a, b))")
|
fresh_db.conn.execute("CREATE TABLE t (a TEXT, b INT, PRIMARY KEY (a, b))")
|
||||||
rows = [{"a": f"x{i}", "b": i} for i in range(num_rows)]
|
rows = [{"a": "x{}".format(i), "b": i} for i in range(num_rows)]
|
||||||
|
|
||||||
with pytest.raises(InvalidColumns) as ex:
|
with pytest.raises(InvalidColumns) as ex:
|
||||||
fresh_db["t"].insert_all(rows, pk="not_a_column")
|
fresh_db["t"].insert_all(rows, pk="not_a_column")
|
||||||
|
|
@ -967,7 +947,7 @@ def test_insert_all_pk_not_in_records_alter_raises(fresh_db, num_rows):
|
||||||
# known - a pk column that is in neither the table nor the records
|
# known - a pk column that is in neither the table nor the records
|
||||||
# still raises
|
# still raises
|
||||||
fresh_db.conn.execute("CREATE TABLE t (a TEXT, b INT, PRIMARY KEY (a, b))")
|
fresh_db.conn.execute("CREATE TABLE t (a TEXT, b INT, PRIMARY KEY (a, b))")
|
||||||
rows = [{"a": f"x{i}", "b": i} for i in range(num_rows)]
|
rows = [{"a": "x{}".format(i), "b": i} for i in range(num_rows)]
|
||||||
|
|
||||||
with pytest.raises(InvalidColumns) as ex:
|
with pytest.raises(InvalidColumns) as ex:
|
||||||
fresh_db["t"].insert_all(rows, pk="not_a_column", alter=True)
|
fresh_db["t"].insert_all(rows, pk="not_a_column", alter=True)
|
||||||
|
|
@ -1138,7 +1118,7 @@ def test_insert_hash_id_columns(fresh_db, use_table_factory):
|
||||||
insert_kwargs = {}
|
insert_kwargs = {}
|
||||||
else:
|
else:
|
||||||
dogs = fresh_db["dogs"]
|
dogs = fresh_db["dogs"]
|
||||||
insert_kwargs = {"hash_id_columns": ("name", "twitter")}
|
insert_kwargs = dict(hash_id_columns=("name", "twitter"))
|
||||||
|
|
||||||
id = dogs.insert(
|
id = dogs.insert(
|
||||||
{"name": "Cleo", "twitter": "cleopaws", "age": 5},
|
{"name": "Cleo", "twitter": "cleopaws", "age": 5},
|
||||||
|
|
@ -1646,7 +1626,7 @@ def test_upsert_uses_pk_from_prior_insert_655(fresh_db):
|
||||||
# Upsert should work without specifying pk again
|
# Upsert should work without specifying pk again
|
||||||
table.upsert({"id": 1, "name": "Alice Updated"})
|
table.upsert({"id": 1, "name": "Alice Updated"})
|
||||||
assert table.count == 1
|
assert table.count == 1
|
||||||
assert next(iter(table.rows))["name"] == "Alice Updated"
|
assert list(table.rows)[0]["name"] == "Alice Updated"
|
||||||
|
|
||||||
|
|
||||||
def test_upsert_all_uses_pk_from_prior_insert_655(fresh_db):
|
def test_upsert_all_uses_pk_from_prior_insert_655(fresh_db):
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils.utils import OperationalError
|
from sqlite_utils.utils import OperationalError
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ EXAMPLES = [
|
||||||
|
|
||||||
@pytest.mark.parametrize("column_def,initial_value,expected_value", EXAMPLES)
|
@pytest.mark.parametrize("column_def,initial_value,expected_value", EXAMPLES)
|
||||||
def test_quote_default_value(fresh_db, column_def, initial_value, expected_value):
|
def test_quote_default_value(fresh_db, column_def, initial_value, expected_value):
|
||||||
fresh_db.execute(f"create table foo (col {column_def})")
|
fresh_db.execute("create table foo (col {})".format(column_def))
|
||||||
assert initial_value == fresh_db["foo"].columns[0].default_value
|
assert initial_value == fresh_db["foo"].columns[0].default_value
|
||||||
assert expected_value == fresh_db.quote_default_value(
|
assert expected_value == fresh_db.quote_default_value(
|
||||||
fresh_db["foo"].columns[0].default_value
|
fresh_db["foo"].columns[0].default_value
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ import sqlite_utils
|
||||||
|
|
||||||
def test_delete_rowid_table(fresh_db):
|
def test_delete_rowid_table(fresh_db):
|
||||||
table = fresh_db["table"]
|
table = fresh_db["table"]
|
||||||
table.insert({"foo": 1})
|
table.insert({"foo": 1}).last_pk
|
||||||
rowid = table.insert({"foo": 2}).last_pk
|
rowid = table.insert({"foo": 2}).last_pk
|
||||||
table.delete(rowid)
|
table.delete(rowid)
|
||||||
assert [{"foo": 1}] == list(table.rows)
|
assert [{"foo": 1}] == list(table.rows)
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
import re
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
|
||||||
from sqlite_utils import cli, recipes
|
from sqlite_utils import cli, recipes
|
||||||
|
from pathlib import Path
|
||||||
|
import pytest
|
||||||
|
import re
|
||||||
|
|
||||||
docs_path = Path(__file__).parent.parent / "docs"
|
docs_path = Path(__file__).parent.parent / "docs"
|
||||||
commands_re = re.compile(r"(?:\$ | )sqlite-utils (\S+)")
|
commands_re = re.compile(r"(?:\$ | )sqlite-utils (\S+)")
|
||||||
|
|
@ -36,7 +34,7 @@ def test_commands_are_documented(documented_commands, command):
|
||||||
|
|
||||||
@pytest.mark.parametrize("command", cli.cli.commands.values())
|
@pytest.mark.parametrize("command", cli.cli.commands.values())
|
||||||
def test_commands_have_help(command):
|
def test_commands_have_help(command):
|
||||||
assert command.help, f"{command} is missing its help"
|
assert command.help, "{} is missing its help".format(command)
|
||||||
|
|
||||||
|
|
||||||
def test_convert_help():
|
def test_convert_help():
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
import datetime
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils.db import NoTable
|
from sqlite_utils.db import NoTable
|
||||||
|
import datetime
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
def test_duplicate(fresh_db):
|
def test_duplicate(fresh_db):
|
||||||
|
|
@ -14,7 +12,7 @@ def test_duplicate(fresh_db):
|
||||||
"bool_col" INTEGER,
|
"bool_col" INTEGER,
|
||||||
"datetime_col" TEXT)""")
|
"datetime_col" TEXT)""")
|
||||||
# Insert one row of mock data:
|
# Insert one row of mock data:
|
||||||
dt = datetime.datetime.now(datetime.timezone.utc)
|
dt = datetime.datetime.now()
|
||||||
data = {
|
data = {
|
||||||
"text_col": "Cleo",
|
"text_col": "Cleo",
|
||||||
"real_col": 3.14,
|
"real_col": 3.14,
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
import pytest
|
from sqlite_utils import Database
|
||||||
|
from sqlite_utils import cli
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
import pytest
|
||||||
from sqlite_utils import Database, cli
|
|
||||||
|
|
||||||
|
|
||||||
def test_enable_counts_specific_table(fresh_db):
|
def test_enable_counts_specific_table(fresh_db):
|
||||||
foo = fresh_db["foo"]
|
foo = fresh_db["foo"]
|
||||||
assert fresh_db.table_names() == []
|
assert fresh_db.table_names() == []
|
||||||
for i in range(10):
|
for i in range(10):
|
||||||
foo.insert({"name": f"item {i}"})
|
foo.insert({"name": "item {}".format(i)})
|
||||||
assert fresh_db.table_names() == ["foo"]
|
assert fresh_db.table_names() == ["foo"]
|
||||||
assert foo.count == 10
|
assert foo.count == 10
|
||||||
# Now enable counts
|
# Now enable counts
|
||||||
|
|
@ -44,7 +44,7 @@ def test_enable_counts_specific_table(fresh_db):
|
||||||
assert list(fresh_db["_counts"].rows) == [{"count": 10, "table": "foo"}]
|
assert list(fresh_db["_counts"].rows) == [{"count": 10, "table": "foo"}]
|
||||||
# Add some items to test the triggers
|
# Add some items to test the triggers
|
||||||
for i in range(5):
|
for i in range(5):
|
||||||
foo.insert({"name": f"item {10 + i}"})
|
foo.insert({"name": "item {}".format(10 + i)})
|
||||||
assert foo.count == 15
|
assert foo.count == 15
|
||||||
assert list(fresh_db["_counts"].rows) == [{"count": 15, "table": "foo"}]
|
assert list(fresh_db["_counts"].rows) == [{"count": 15, "table": "foo"}]
|
||||||
# Delete some items
|
# Delete some items
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,19 @@
|
||||||
import itertools
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils.db import InvalidColumns
|
from sqlite_utils.db import InvalidColumns
|
||||||
|
import itertools
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("table", [None, "Species"])
|
@pytest.mark.parametrize("table", [None, "Species"])
|
||||||
@pytest.mark.parametrize("fk_column", [None, "species"])
|
@pytest.mark.parametrize("fk_column", [None, "species"])
|
||||||
def test_extract_single_column(fresh_db, table, fk_column):
|
def test_extract_single_column(fresh_db, table, fk_column):
|
||||||
expected_table = table or "species"
|
expected_table = table or "species"
|
||||||
expected_fk = fk_column or f"{expected_table}_id"
|
expected_fk = fk_column or "{}_id".format(expected_table)
|
||||||
iter_species = itertools.cycle(["Palm", "Spruce", "Mangrove", "Oak"])
|
iter_species = itertools.cycle(["Palm", "Spruce", "Mangrove", "Oak"])
|
||||||
fresh_db["tree"].insert_all(
|
fresh_db["tree"].insert_all(
|
||||||
(
|
(
|
||||||
{
|
{
|
||||||
"id": i,
|
"id": i,
|
||||||
"name": f"Tree {i}",
|
"name": "Tree {}".format(i),
|
||||||
"species": next(iter_species),
|
"species": next(iter_species),
|
||||||
"end": 1,
|
"end": 1,
|
||||||
}
|
}
|
||||||
|
|
@ -28,12 +26,13 @@ def test_extract_single_column(fresh_db, table, fk_column):
|
||||||
'CREATE TABLE "tree" (\n'
|
'CREATE TABLE "tree" (\n'
|
||||||
' "id" INTEGER PRIMARY KEY,\n'
|
' "id" INTEGER PRIMARY KEY,\n'
|
||||||
' "name" TEXT,\n'
|
' "name" TEXT,\n'
|
||||||
f' "{expected_fk}" INTEGER REFERENCES "{expected_table}"("id"),\n'
|
' "{}" INTEGER REFERENCES "{}"("id"),\n'.format(expected_fk, expected_table)
|
||||||
+ ' "end" INTEGER\n'
|
+ ' "end" INTEGER\n'
|
||||||
+ ")"
|
+ ")"
|
||||||
)
|
)
|
||||||
assert fresh_db[expected_table].schema == (
|
assert fresh_db[expected_table].schema == (
|
||||||
f'CREATE TABLE "{expected_table}" (\n' + ' "id" INTEGER PRIMARY KEY,\n'
|
'CREATE TABLE "{}" (\n'.format(expected_table)
|
||||||
|
+ ' "id" INTEGER PRIMARY KEY,\n'
|
||||||
' "species" TEXT\n'
|
' "species" TEXT\n'
|
||||||
")"
|
")"
|
||||||
)
|
)
|
||||||
|
|
@ -58,7 +57,7 @@ def test_extract_multiple_columns_with_rename(fresh_db):
|
||||||
(
|
(
|
||||||
{
|
{
|
||||||
"id": i,
|
"id": i,
|
||||||
"name": f"Tree {i}",
|
"name": "Tree {}".format(i),
|
||||||
"common_name": next(iter_common),
|
"common_name": next(iter_common),
|
||||||
"latin_name": next(iter_latin),
|
"latin_name": next(iter_latin),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils.db import Index
|
from sqlite_utils.db import Index
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"kwargs,expected_table",
|
"kwargs,expected_table",
|
||||||
[
|
[
|
||||||
({"extracts": {"species_id": "Species"}}, "Species"),
|
(dict(extracts={"species_id": "Species"}), "Species"),
|
||||||
({"extracts": ["species_id"]}, "species_id"),
|
(dict(extracts=["species_id"]), "species_id"),
|
||||||
({"extracts": ("species_id",)}, "species_id"),
|
(dict(extracts=("species_id",)), "species_id"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@pytest.mark.parametrize("use_table_factory", [True, False])
|
@pytest.mark.parametrize("use_table_factory", [True, False])
|
||||||
|
|
@ -31,11 +30,15 @@ def test_extracts(fresh_db, kwargs, expected_table, use_table_factory):
|
||||||
# Should now have two tables: Trees and Species
|
# Should now have two tables: Trees and Species
|
||||||
assert {expected_table, "Trees"} == set(fresh_db.table_names())
|
assert {expected_table, "Trees"} == set(fresh_db.table_names())
|
||||||
assert (
|
assert (
|
||||||
f'CREATE TABLE "{expected_table}" (\n "id" INTEGER PRIMARY KEY,\n "value" TEXT\n)'
|
'CREATE TABLE "{}" (\n "id" INTEGER PRIMARY KEY,\n "value" TEXT\n)'.format(
|
||||||
|
expected_table
|
||||||
|
)
|
||||||
== fresh_db[expected_table].schema
|
== fresh_db[expected_table].schema
|
||||||
)
|
)
|
||||||
assert (
|
assert (
|
||||||
f'CREATE TABLE "Trees" (\n "id" INTEGER,\n "species_id" INTEGER REFERENCES "{expected_table}"("id")\n)'
|
'CREATE TABLE "Trees" (\n "id" INTEGER,\n "species_id" INTEGER REFERENCES "{}"("id")\n)'.format(
|
||||||
|
expected_table
|
||||||
|
)
|
||||||
== fresh_db["Trees"].schema
|
== fresh_db["Trees"].schema
|
||||||
)
|
)
|
||||||
# Should have a foreign key reference
|
# Should have a foreign key reference
|
||||||
|
|
@ -48,7 +51,7 @@ def test_extracts(fresh_db, kwargs, expected_table, use_table_factory):
|
||||||
assert [
|
assert [
|
||||||
Index(
|
Index(
|
||||||
seq=0,
|
seq=0,
|
||||||
name=f"idx_{expected_table}_value",
|
name="idx_{}_value".format(expected_table),
|
||||||
unique=1,
|
unique=1,
|
||||||
origin="c",
|
origin="c",
|
||||||
partial=0,
|
partial=0,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
"""Tests for compound (multi-column) foreign keys - issue #594."""
|
"""Tests for compound (multi-column) foreign keys - issue #594."""
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils import Database
|
from sqlite_utils import Database
|
||||||
from sqlite_utils.db import AlterError, ForeignKey
|
from sqlite_utils.db import AlterError, ForeignKey
|
||||||
from sqlite_utils.utils import sqlite3
|
from sqlite_utils.utils import sqlite3
|
||||||
|
|
@ -65,7 +64,7 @@ def test_foreign_key_no_longer_unpacks_as_tuple(fresh_db):
|
||||||
fresh_db["books"].add_foreign_key("author_id", "authors", "id")
|
fresh_db["books"].add_foreign_key("author_id", "authors", "id")
|
||||||
fk = fresh_db["books"].foreign_keys[0]
|
fk = fresh_db["books"].foreign_keys[0]
|
||||||
with pytest.raises(TypeError):
|
with pytest.raises(TypeError):
|
||||||
_table, _column, _other_table, _other_column = fk
|
table, column, other_table, other_column = fk
|
||||||
with pytest.raises(TypeError):
|
with pytest.raises(TypeError):
|
||||||
fk[0]
|
fk[0]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
from unittest.mock import ANY
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils import Database
|
from sqlite_utils import Database
|
||||||
from sqlite_utils.utils import sqlite3
|
from sqlite_utils.utils import sqlite3
|
||||||
|
from unittest.mock import ANY
|
||||||
|
|
||||||
search_records = [
|
search_records = [
|
||||||
{
|
{
|
||||||
|
|
@ -105,10 +103,9 @@ def test_search_limit_offset(fresh_db):
|
||||||
table.enable_fts(["text", "country"], fts_version="FTS4")
|
table.enable_fts(["text", "country"], fts_version="FTS4")
|
||||||
assert len(list(table.search("are"))) == 2
|
assert len(list(table.search("are"))) == 2
|
||||||
assert len(list(table.search("are", limit=1))) == 1
|
assert len(list(table.search("are", limit=1))) == 1
|
||||||
assert next(iter(table.search("are", limit=1, order_by="rowid")))["rowid"] == 1
|
assert list(table.search("are", limit=1, order_by="rowid"))[0]["rowid"] == 1
|
||||||
assert (
|
assert (
|
||||||
next(iter(table.search("are", limit=1, offset=1, order_by="rowid")))["rowid"]
|
list(table.search("are", limit=1, offset=1, order_by="rowid"))[0]["rowid"] == 2
|
||||||
== 2
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -226,20 +223,20 @@ def test_populate_fts_escape_table_names(fresh_db):
|
||||||
|
|
||||||
@pytest.mark.parametrize("fts_version", ("4", "5"))
|
@pytest.mark.parametrize("fts_version", ("4", "5"))
|
||||||
def test_fts_tokenize(fresh_db, fts_version):
|
def test_fts_tokenize(fresh_db, fts_version):
|
||||||
table_name = f"searchable_{fts_version}"
|
table_name = "searchable_{}".format(fts_version)
|
||||||
table = fresh_db[table_name]
|
table = fresh_db[table_name]
|
||||||
table.insert_all(search_records)
|
table.insert_all(search_records)
|
||||||
# Test without porter stemming
|
# Test without porter stemming
|
||||||
table.enable_fts(
|
table.enable_fts(
|
||||||
["text", "country"],
|
["text", "country"],
|
||||||
fts_version=f"FTS{fts_version}",
|
fts_version="FTS{}".format(fts_version),
|
||||||
)
|
)
|
||||||
assert [] == list(table.search("bite"))
|
assert [] == list(table.search("bite"))
|
||||||
# Test WITH stemming
|
# Test WITH stemming
|
||||||
table.disable_fts()
|
table.disable_fts()
|
||||||
table.enable_fts(
|
table.enable_fts(
|
||||||
["text", "country"],
|
["text", "country"],
|
||||||
fts_version=f"FTS{fts_version}",
|
fts_version="FTS{}".format(fts_version),
|
||||||
tokenize="porter",
|
tokenize="porter",
|
||||||
)
|
)
|
||||||
rows = list(table.search("bite", order_by="rowid"))
|
rows = list(table.search("bite", order_by="rowid"))
|
||||||
|
|
@ -254,10 +251,10 @@ def test_fts_tokenize(fresh_db, fts_version):
|
||||||
|
|
||||||
def test_optimize_fts(fresh_db):
|
def test_optimize_fts(fresh_db):
|
||||||
for fts_version in ("4", "5"):
|
for fts_version in ("4", "5"):
|
||||||
table_name = f"searchable_{fts_version}"
|
table_name = "searchable_{}".format(fts_version)
|
||||||
table = fresh_db[table_name]
|
table = fresh_db[table_name]
|
||||||
table.insert_all(search_records)
|
table.insert_all(search_records)
|
||||||
table.enable_fts(["text", "country"], fts_version=f"FTS{fts_version}")
|
table.enable_fts(["text", "country"], fts_version="FTS{}".format(fts_version))
|
||||||
# You can call optimize successfully against the tables OR their _fts equivalents:
|
# You can call optimize successfully against the tables OR their _fts equivalents:
|
||||||
for table_name in (
|
for table_name in (
|
||||||
"searchable_4",
|
"searchable_4",
|
||||||
|
|
@ -313,12 +310,12 @@ def test_disable_fts(fresh_db, create_triggers):
|
||||||
expected_triggers = {"searchable_ai", "searchable_ad", "searchable_au"}
|
expected_triggers = {"searchable_ai", "searchable_ad", "searchable_au"}
|
||||||
else:
|
else:
|
||||||
expected_triggers = set()
|
expected_triggers = set()
|
||||||
assert expected_triggers == {
|
assert expected_triggers == set(
|
||||||
r[0]
|
r[0]
|
||||||
for r in fresh_db.execute(
|
for r in fresh_db.execute(
|
||||||
"select name from sqlite_master where type = 'trigger'"
|
"select name from sqlite_master where type = 'trigger'"
|
||||||
).fetchall()
|
).fetchall()
|
||||||
}
|
)
|
||||||
# Now run .disable_fts() and confirm it worked
|
# Now run .disable_fts() and confirm it worked
|
||||||
table.disable_fts()
|
table.disable_fts()
|
||||||
assert (
|
assert (
|
||||||
|
|
@ -427,7 +424,7 @@ def test_enable_fts_replace(kwargs):
|
||||||
db["books"].enable_fts(**kwargs, replace=True)
|
db["books"].enable_fts(**kwargs, replace=True)
|
||||||
# Check that the new configuration is correct
|
# Check that the new configuration is correct
|
||||||
if should_have_changed_columns:
|
if should_have_changed_columns:
|
||||||
assert db["books_fts"].columns_dict.keys() == {"title"}
|
assert db["books_fts"].columns_dict.keys() == set(["title"])
|
||||||
if "create_triggers" in kwargs:
|
if "create_triggers" in kwargs:
|
||||||
assert db["books"].triggers
|
assert db["books"].triggers
|
||||||
if "fts_version" in kwargs:
|
if "fts_version" in kwargs:
|
||||||
|
|
@ -744,7 +741,6 @@ def test_enable_fts_cli_on_view_errors(tmpdir):
|
||||||
db.create_view("v", "select * from t")
|
db.create_view("v", "select * from t")
|
||||||
db.close()
|
db.close()
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
|
||||||
from sqlite_utils import cli as cli_module
|
from sqlite_utils import cli as cli_module
|
||||||
|
|
||||||
result = CliRunner().invoke(cli_module.cli, ["enable-fts", db_path, "v", "text"])
|
result = CliRunner().invoke(cli_module.cli, ["enable-fts", db_path, "v", "text"])
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils.db import NotFoundError
|
from sqlite_utils.db import NotFoundError
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
import json
|
import json
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from click.testing import CliRunner
|
|
||||||
|
|
||||||
|
from click.testing import CliRunner
|
||||||
from sqlite_utils.cli import cli
|
from sqlite_utils.cli import cli
|
||||||
from sqlite_utils.db import Database
|
from sqlite_utils.db import Database
|
||||||
from sqlite_utils.utils import find_spatialite, sqlite3
|
from sqlite_utils.utils import find_spatialite, sqlite3
|
||||||
|
|
@ -105,7 +104,7 @@ def test_query_load_extension(use_spatialite_shortcut):
|
||||||
[
|
[
|
||||||
":memory:",
|
":memory:",
|
||||||
"select spatialite_version()",
|
"select spatialite_version()",
|
||||||
f"--load-extension={load_extension}",
|
"--load-extension={}".format(load_extension),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0, result.stdout
|
assert result.exit_code == 0, result.stdout
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import hypothesis.strategies as st
|
|
||||||
from hypothesis import given
|
from hypothesis import given
|
||||||
|
import hypothesis.strategies as st
|
||||||
import sqlite_utils
|
import sqlite_utils
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
|
from sqlite_utils import cli, Database
|
||||||
|
from click.testing import CliRunner
|
||||||
import os
|
import os
|
||||||
import pathlib
|
import pathlib
|
||||||
import sys
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from click.testing import CliRunner
|
import sys
|
||||||
|
|
||||||
from sqlite_utils import Database, cli
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("silent", (False, True))
|
@pytest.mark.parametrize("silent", (False, True))
|
||||||
|
|
@ -46,7 +44,7 @@ def test_insert_files(silent, pk_args, expected_pks):
|
||||||
)
|
)
|
||||||
cols = []
|
cols = []
|
||||||
for coltype in coltypes:
|
for coltype in coltypes:
|
||||||
cols += ["-c", f"{coltype}:{coltype}"]
|
cols += ["-c", "{}:{}".format(coltype, coltype)]
|
||||||
result = runner.invoke(
|
result = runner.invoke(
|
||||||
cli.cli,
|
cli.cli,
|
||||||
["insert-files", db_path, "files", str(tmpdir)]
|
["insert-files", db_path, "files", str(tmpdir)]
|
||||||
|
|
@ -144,7 +142,7 @@ def test_insert_files_stdin(use_text, encoding, input, expected):
|
||||||
)
|
)
|
||||||
assert result.exit_code == 0, result.stdout
|
assert result.exit_code == 0, result.stdout
|
||||||
db = Database(db_path)
|
db = Database(db_path)
|
||||||
row = next(iter(db["files"].rows))
|
row = list(db["files"].rows)[0]
|
||||||
key = "content"
|
key = "content"
|
||||||
if use_text:
|
if use_text:
|
||||||
key = "content_text"
|
key = "content_text"
|
||||||
|
|
@ -169,5 +167,5 @@ def test_insert_files_bad_text_encoding_error():
|
||||||
)
|
)
|
||||||
assert result.exit_code == 1, result.output
|
assert result.exit_code == 1, result.output
|
||||||
assert result.output.strip().startswith(
|
assert result.output.strip().startswith(
|
||||||
f"Error: Could not read file '{latin.resolve()!s}' as text"
|
"Error: Could not read file '{}' as text".format(str(latin.resolve()))
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
|
from sqlite_utils.db import Index, View, Database, XIndex, XIndexColumn
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils.db import Database, Index, View, XIndex, XIndexColumn
|
|
||||||
|
|
||||||
|
|
||||||
def _check_supports_strict():
|
def _check_supports_strict():
|
||||||
"""Check if SQLite supports strict tables without leaking the database."""
|
"""Check if SQLite supports strict tables without leaking the database."""
|
||||||
|
|
@ -58,8 +57,8 @@ def test_detect_fts_similar_tables(fresh_db, reverse_order):
|
||||||
fresh_db[table2].insert({"title": "Hello"}).enable_fts(
|
fresh_db[table2].insert({"title": "Hello"}).enable_fts(
|
||||||
["title"], fts_version="FTS4"
|
["title"], fts_version="FTS4"
|
||||||
)
|
)
|
||||||
assert fresh_db[table1].detect_fts() == f"{table1}_fts"
|
assert fresh_db[table1].detect_fts() == "{}_fts".format(table1)
|
||||||
assert fresh_db[table2].detect_fts() == f"{table2}_fts"
|
assert fresh_db[table2].detect_fts() == "{}_fts".format(table2)
|
||||||
|
|
||||||
|
|
||||||
def test_tables(existing_db):
|
def test_tables(existing_db):
|
||||||
|
|
@ -312,7 +311,6 @@ def test_table_strict(fresh_db, create_table, expected_strict):
|
||||||
1,
|
1,
|
||||||
1.3,
|
1.3,
|
||||||
"foo",
|
"foo",
|
||||||
"O'Brien",
|
|
||||||
True,
|
True,
|
||||||
b"binary",
|
b"binary",
|
||||||
),
|
),
|
||||||
|
|
@ -325,16 +323,6 @@ def test_table_default_values(fresh_db, value):
|
||||||
assert default_values == {"value": value}
|
assert default_values == {"value": value}
|
||||||
|
|
||||||
|
|
||||||
def test_table_default_values_escaped_quotes(fresh_db):
|
|
||||||
# SQLite stores string defaults with single quotes doubled, so
|
|
||||||
# introspection needs to unescape them again
|
|
||||||
fresh_db.execute(
|
|
||||||
"create table t (id integer primary key, name text default 'O''Brien')"
|
|
||||||
)
|
|
||||||
assert "default 'O''Brien'" in fresh_db["t"].schema
|
|
||||||
assert fresh_db["t"].default_values == {"name": "O'Brien"}
|
|
||||||
|
|
||||||
|
|
||||||
def test_pks_use_primary_key_declaration_order(fresh_db):
|
def test_pks_use_primary_key_declaration_order(fresh_db):
|
||||||
# PRIMARY KEY (a, b) declared against columns stored in order (b, a) -
|
# PRIMARY KEY (a, b) declared against columns stored in order (b, a) -
|
||||||
# pks must follow the declaration order, which is what SQLite uses to
|
# pks must follow the declaration order, which is what SQLite uses to
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ Tests for list-based iteration in insert_all and upsert_all
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils import Database
|
from sqlite_utils import Database
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils.db import Index
|
from sqlite_utils.db import Index
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
def test_lookup_new_table(fresh_db):
|
def test_lookup_new_table(fresh_db):
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils.db import ForeignKey, NoObviousTable
|
from sqlite_utils.db import ForeignKey, NoObviousTable
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
def test_insert_m2m_single(fresh_db):
|
def test_insert_m2m_single(fresh_db):
|
||||||
|
|
@ -66,7 +65,8 @@ def test_insert_m2m_iterable(fresh_db):
|
||||||
iterable_records = ({"id": 1, "name": "Phineas"}, {"id": 2, "name": "Ferb"})
|
iterable_records = ({"id": 1, "name": "Phineas"}, {"id": 2, "name": "Ferb"})
|
||||||
|
|
||||||
def iterable():
|
def iterable():
|
||||||
yield from iterable_records
|
for record in iterable_records:
|
||||||
|
yield record
|
||||||
|
|
||||||
platypuses = fresh_db["platypuses"]
|
platypuses = fresh_db["platypuses"]
|
||||||
platypuses.insert({"id": 1, "name": "Perry"}, pk="id").m2m(
|
platypuses.insert({"id": 1, "name": "Perry"}, pk="id").m2m(
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import sqlite_utils
|
import sqlite_utils
|
||||||
from sqlite_utils import Migrations
|
from sqlite_utils import Migrations
|
||||||
|
|
||||||
|
|
@ -155,9 +154,10 @@ def test_non_transactional_migration_allows_vacuum(tmpdir):
|
||||||
|
|
||||||
def test_apply_composes_inside_outer_transaction(migrations):
|
def test_apply_composes_inside_outer_transaction(migrations):
|
||||||
db = sqlite_utils.Database(memory=True)
|
db = sqlite_utils.Database(memory=True)
|
||||||
with pytest.raises(ZeroDivisionError), db.atomic():
|
with pytest.raises(ZeroDivisionError):
|
||||||
migrations.apply(db)
|
with db.atomic():
|
||||||
raise ZeroDivisionError
|
migrations.apply(db)
|
||||||
|
raise ZeroDivisionError
|
||||||
# The outer transaction rolled back, taking the migrations with it
|
# The outer transaction rolled back, taking the migrations with it
|
||||||
assert db.table_names() == []
|
assert db.table_names() == []
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,9 @@
|
||||||
import importlib
|
|
||||||
import sqlite3
|
|
||||||
import sys
|
|
||||||
|
|
||||||
import click
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
import click
|
||||||
from sqlite_utils import Database, cli, hookimpl, plugins
|
import importlib
|
||||||
|
import pytest
|
||||||
|
import sys
|
||||||
|
from sqlite_utils import cli, Database, hookimpl, plugins
|
||||||
|
|
||||||
|
|
||||||
def _supports_pragma_function_list():
|
def _supports_pragma_function_list():
|
||||||
|
|
@ -14,7 +11,7 @@ def _supports_pragma_function_list():
|
||||||
try:
|
try:
|
||||||
db.execute("select * from pragma_function_list()")
|
db.execute("select * from pragma_function_list()")
|
||||||
return True
|
return True
|
||||||
except sqlite3.DatabaseError:
|
except Exception:
|
||||||
return False
|
return False
|
||||||
finally:
|
finally:
|
||||||
db.close()
|
db.close()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import types
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
import types
|
||||||
|
|
||||||
from sqlite_utils.utils import sqlite3
|
from sqlite_utils.utils import sqlite3
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
import json
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils import recipes
|
from sqlite_utils import recipes
|
||||||
from sqlite_utils.utils import sqlite3
|
from sqlite_utils.utils import sqlite3
|
||||||
|
import json
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
import pathlib
|
|
||||||
import sqlite3
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils import Database
|
from sqlite_utils import Database
|
||||||
|
import sqlite3
|
||||||
|
import pathlib
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
def test_recreate_ignored_for_in_memory():
|
def test_recreate_ignored_for_in_memory():
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
|
from sqlite_utils.utils import rows_from_file, Format, RowError
|
||||||
from io import BytesIO, StringIO
|
from io import BytesIO, StringIO
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils.utils import Format, RowError, rows_from_file
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"input,expected_format",
|
"input,expected_format",
|
||||||
|
|
@ -31,7 +29,7 @@ def test_rows_from_file_detect_format(input, expected_format):
|
||||||
)
|
)
|
||||||
def test_rows_from_file_extra_fields_strategies(ignore_extras, extras_key, expected):
|
def test_rows_from_file_extra_fields_strategies(ignore_extras, extras_key, expected):
|
||||||
try:
|
try:
|
||||||
rows, _format = rows_from_file(
|
rows, format = rows_from_file(
|
||||||
BytesIO(b"id,name\r\n1,Cleo,oops"),
|
BytesIO(b"id,name\r\n1,Cleo,oops"),
|
||||||
format=Format.CSV,
|
format=Format.CSV,
|
||||||
ignore_extras=ignore_extras,
|
ignore_extras=ignore_extras,
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
import pathlib
|
from sqlite_utils import cli, Database
|
||||||
|
|
||||||
import pytest
|
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
|
import pathlib
|
||||||
from sqlite_utils import Database, cli
|
import pytest
|
||||||
|
|
||||||
sniff_dir = pathlib.Path(__file__).parent / "sniff"
|
sniff_dir = pathlib.Path(__file__).parent / "sniff"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
from collections import OrderedDict
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from collections import OrderedDict
|
||||||
from sqlite_utils.utils import suggest_column_types
|
from sqlite_utils.utils import suggest_column_types
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,18 +53,16 @@ def test_with_tracer():
|
||||||
assert len(collected) == 4
|
assert len(collected) == 4
|
||||||
assert collected == [
|
assert collected == [
|
||||||
(
|
(
|
||||||
(
|
"SELECT name FROM sqlite_master\n"
|
||||||
"SELECT name FROM sqlite_master\n"
|
" WHERE rootpage = 0\n"
|
||||||
" WHERE rootpage = 0\n"
|
" AND (\n"
|
||||||
" AND (\n"
|
" sql LIKE :like\n"
|
||||||
" sql LIKE :like\n"
|
" OR sql LIKE :like2\n"
|
||||||
" OR sql LIKE :like2\n"
|
" OR (\n"
|
||||||
" OR (\n"
|
" tbl_name = :table\n"
|
||||||
" tbl_name = :table\n"
|
" AND sql LIKE '%VIRTUAL TABLE%USING FTS%'\n"
|
||||||
" AND sql LIKE '%VIRTUAL TABLE%USING FTS%'\n"
|
" )\n"
|
||||||
" )\n"
|
" )",
|
||||||
" )"
|
|
||||||
),
|
|
||||||
{
|
{
|
||||||
"like": "%VIRTUAL TABLE%USING FTS%content=[dogs]%",
|
"like": "%VIRTUAL TABLE%USING FTS%content=[dogs]%",
|
||||||
"like2": '%VIRTUAL TABLE%USING FTS%content="dogs"%',
|
"like2": '%VIRTUAL TABLE%USING FTS%content="dogs"%',
|
||||||
|
|
@ -74,23 +72,21 @@ def test_with_tracer():
|
||||||
("select name from sqlite_master where type = 'view'", None),
|
("select name from sqlite_master where type = 'view'", None),
|
||||||
("select sql from sqlite_master where name = ?", ("dogs_fts",)),
|
("select sql from sqlite_master where name = ?", ("dogs_fts",)),
|
||||||
(
|
(
|
||||||
(
|
'with "original" as (\n'
|
||||||
'with "original" as (\n'
|
" select\n"
|
||||||
" select\n"
|
" rowid,\n"
|
||||||
" rowid,\n"
|
" *\n"
|
||||||
" *\n"
|
' from "dogs"\n'
|
||||||
' from "dogs"\n'
|
")\n"
|
||||||
")\n"
|
"select\n"
|
||||||
"select\n"
|
' "original".*\n'
|
||||||
' "original".*\n'
|
"from\n"
|
||||||
"from\n"
|
' "original"\n'
|
||||||
' "original"\n'
|
' join "dogs_fts" on "original".rowid = "dogs_fts".rowid\n'
|
||||||
' join "dogs_fts" on "original".rowid = "dogs_fts".rowid\n'
|
"where\n"
|
||||||
"where\n"
|
' "dogs_fts" match :query\n'
|
||||||
' "dogs_fts" match :query\n'
|
"order by\n"
|
||||||
"order by\n"
|
' "dogs_fts".rank',
|
||||||
' "dogs_fts".rank'
|
|
||||||
),
|
|
||||||
{"query": "Cleopaws"},
|
{"query": "Cleopaws"},
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
import sqlite3
|
from sqlite_utils.db import ForeignKey, TransformError
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils.db import ForeignKey, TransactionError, TransformError
|
|
||||||
from sqlite_utils.utils import OperationalError
|
from sqlite_utils.utils import OperationalError
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
|
|
@ -114,7 +111,7 @@ def test_transform_sql_table_with_primary_key(
|
||||||
if use_pragma_foreign_keys:
|
if use_pragma_foreign_keys:
|
||||||
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
||||||
dogs.insert({"id": 1, "name": "Cleo", "age": "5"}, pk="id")
|
dogs.insert({"id": 1, "name": "Cleo", "age": "5"}, pk="id")
|
||||||
sql = dogs.transform_sql(**{**params, "tmp_suffix": "suffix"})
|
sql = dogs.transform_sql(**{**params, **{"tmp_suffix": "suffix"}})
|
||||||
assert sql == expected_sql
|
assert sql == expected_sql
|
||||||
# Check that .transform() runs without exceptions:
|
# Check that .transform() runs without exceptions:
|
||||||
with fresh_db.tracer(tracer):
|
with fresh_db.tracer(tracer):
|
||||||
|
|
@ -187,7 +184,7 @@ def test_transform_sql_table_with_no_primary_key(
|
||||||
if use_pragma_foreign_keys:
|
if use_pragma_foreign_keys:
|
||||||
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
||||||
dogs.insert({"id": 1, "name": "Cleo", "age": "5"})
|
dogs.insert({"id": 1, "name": "Cleo", "age": "5"})
|
||||||
sql = dogs.transform_sql(**{**params, "tmp_suffix": "suffix"})
|
sql = dogs.transform_sql(**{**params, **{"tmp_suffix": "suffix"}})
|
||||||
assert sql == expected_sql
|
assert sql == expected_sql
|
||||||
# Check that .transform() runs without exceptions:
|
# Check that .transform() runs without exceptions:
|
||||||
with fresh_db.tracer(tracer):
|
with fresh_db.tracer(tracer):
|
||||||
|
|
@ -433,163 +430,6 @@ def test_transform_verify_foreign_keys(fresh_db):
|
||||||
assert fresh_db.conn.execute("PRAGMA foreign_keys").fetchone()[0]
|
assert fresh_db.conn.execute("PRAGMA foreign_keys").fetchone()[0]
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("use_pragma_foreign_keys", [False, True])
|
|
||||||
def test_transform_on_delete_cascade_does_not_delete_records(
|
|
||||||
fresh_db, use_pragma_foreign_keys
|
|
||||||
):
|
|
||||||
# Transforming a table drops and recreates it - if another table references
|
|
||||||
# it with ON DELETE CASCADE and PRAGMA foreign_keys is on, that drop must
|
|
||||||
# not cascade and delete the referencing records
|
|
||||||
if use_pragma_foreign_keys:
|
|
||||||
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
|
||||||
fresh_db.executescript("""
|
|
||||||
CREATE TABLE authors (id INTEGER PRIMARY KEY, name TEXT);
|
|
||||||
CREATE TABLE books (
|
|
||||||
id INTEGER PRIMARY KEY,
|
|
||||||
title TEXT,
|
|
||||||
author_id INTEGER REFERENCES authors(id) ON DELETE CASCADE
|
|
||||||
);
|
|
||||||
""")
|
|
||||||
fresh_db["authors"].insert({"id": 1, "name": "Ursula K. Le Guin"})
|
|
||||||
fresh_db["books"].insert({"id": 1, "title": "The Dispossessed", "author_id": 1})
|
|
||||||
# Transform the table on the other end of the cascading foreign key
|
|
||||||
fresh_db["authors"].transform(rename={"name": "author_name"})
|
|
||||||
assert list(fresh_db["authors"].rows) == [
|
|
||||||
{"id": 1, "author_name": "Ursula K. Le Guin"}
|
|
||||||
]
|
|
||||||
assert list(fresh_db["books"].rows) == [
|
|
||||||
{"id": 1, "title": "The Dispossessed", "author_id": 1}
|
|
||||||
]
|
|
||||||
# Transforming the table with the cascading foreign key should not
|
|
||||||
# delete its records either
|
|
||||||
fresh_db["books"].transform(rename={"title": "book_title"})
|
|
||||||
assert list(fresh_db["books"].rows) == [
|
|
||||||
{"id": 1, "book_title": "The Dispossessed", "author_id": 1}
|
|
||||||
]
|
|
||||||
if use_pragma_foreign_keys:
|
|
||||||
assert fresh_db.conn.execute("PRAGMA foreign_keys").fetchone()[0]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("on_delete", ["CASCADE", "SET NULL", "SET DEFAULT", "cascade"])
|
|
||||||
def test_transform_in_transaction_refuses_destructive_on_delete(fresh_db, on_delete):
|
|
||||||
# PRAGMA foreign_keys is a no-op inside a transaction, so transforming a
|
|
||||||
# table referenced by ON DELETE CASCADE / SET NULL / SET DEFAULT foreign
|
|
||||||
# keys inside an open transaction would fire those actions when the old
|
|
||||||
# table is dropped - transform() should refuse instead
|
|
||||||
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
|
||||||
fresh_db.executescript(f"""
|
|
||||||
CREATE TABLE authors (id INTEGER PRIMARY KEY, name TEXT);
|
|
||||||
CREATE TABLE books (
|
|
||||||
id INTEGER PRIMARY KEY,
|
|
||||||
title TEXT,
|
|
||||||
author_id INTEGER REFERENCES authors(id) ON DELETE {on_delete}
|
|
||||||
);
|
|
||||||
""")
|
|
||||||
fresh_db["authors"].insert({"id": 1, "name": "Ursula K. Le Guin"})
|
|
||||||
fresh_db["books"].insert({"id": 1, "title": "The Dispossessed", "author_id": 1})
|
|
||||||
previous_schema = fresh_db["authors"].schema
|
|
||||||
with fresh_db.atomic(), pytest.raises(TransactionError) as excinfo:
|
|
||||||
fresh_db["authors"].transform(rename={"name": "author_name"})
|
|
||||||
message = str(excinfo.value)
|
|
||||||
assert "books" in message
|
|
||||||
assert f"ON DELETE {on_delete.upper()}" in message
|
|
||||||
# Nothing should have changed
|
|
||||||
assert fresh_db["authors"].schema == previous_schema
|
|
||||||
assert list(fresh_db["books"].rows) == [
|
|
||||||
{"id": 1, "title": "The Dispossessed", "author_id": 1}
|
|
||||||
]
|
|
||||||
assert fresh_db.conn.execute("PRAGMA foreign_keys").fetchone()[0]
|
|
||||||
|
|
||||||
|
|
||||||
def test_transform_in_transaction_refuses_self_referential_cascade(fresh_db):
|
|
||||||
# The copied table carries a foreign key referencing the original table
|
|
||||||
# name, so a self-referential cascade would wipe the copy too
|
|
||||||
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
|
||||||
fresh_db.executescript("""
|
|
||||||
CREATE TABLE categories (
|
|
||||||
id INTEGER PRIMARY KEY,
|
|
||||||
name TEXT,
|
|
||||||
parent_id INTEGER REFERENCES categories(id) ON DELETE CASCADE
|
|
||||||
);
|
|
||||||
""")
|
|
||||||
fresh_db["categories"].insert_all(
|
|
||||||
[
|
|
||||||
{"id": 1, "name": "Fiction", "parent_id": None},
|
|
||||||
{"id": 2, "name": "Science Fiction", "parent_id": 1},
|
|
||||||
]
|
|
||||||
)
|
|
||||||
with fresh_db.atomic(), pytest.raises(TransactionError) as excinfo:
|
|
||||||
fresh_db["categories"].transform(rename={"name": "title"})
|
|
||||||
assert "categories" in str(excinfo.value)
|
|
||||||
assert fresh_db["categories"].count == 2
|
|
||||||
|
|
||||||
|
|
||||||
def test_transform_in_transaction_allowed_with_no_action_foreign_key(fresh_db):
|
|
||||||
# An inbound foreign key without a destructive ON DELETE action is safe
|
|
||||||
# inside a transaction thanks to PRAGMA defer_foreign_keys
|
|
||||||
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
|
||||||
fresh_db.executescript("""
|
|
||||||
CREATE TABLE authors (id INTEGER PRIMARY KEY, name TEXT);
|
|
||||||
CREATE TABLE books (
|
|
||||||
id INTEGER PRIMARY KEY,
|
|
||||||
title TEXT,
|
|
||||||
author_id INTEGER REFERENCES authors(id)
|
|
||||||
);
|
|
||||||
""")
|
|
||||||
fresh_db["authors"].insert({"id": 1, "name": "Ursula K. Le Guin"})
|
|
||||||
fresh_db["books"].insert({"id": 1, "title": "The Dispossessed", "author_id": 1})
|
|
||||||
with fresh_db.atomic():
|
|
||||||
fresh_db["authors"].transform(rename={"name": "author_name"})
|
|
||||||
assert list(fresh_db["authors"].rows) == [
|
|
||||||
{"id": 1, "author_name": "Ursula K. Le Guin"}
|
|
||||||
]
|
|
||||||
assert list(fresh_db["books"].rows) == [
|
|
||||||
{"id": 1, "title": "The Dispossessed", "author_id": 1}
|
|
||||||
]
|
|
||||||
assert fresh_db.conn.execute("PRAGMA foreign_keys").fetchone()[0]
|
|
||||||
|
|
||||||
|
|
||||||
def test_transform_in_transaction_allowed_for_child_table(fresh_db):
|
|
||||||
# The table being transformed only has an outbound foreign key - dropping
|
|
||||||
# it fires no ON DELETE actions, so this is allowed inside a transaction
|
|
||||||
fresh_db.conn.execute("PRAGMA foreign_keys=ON")
|
|
||||||
fresh_db.executescript("""
|
|
||||||
CREATE TABLE authors (id INTEGER PRIMARY KEY, name TEXT);
|
|
||||||
CREATE TABLE books (
|
|
||||||
id INTEGER PRIMARY KEY,
|
|
||||||
title TEXT,
|
|
||||||
author_id INTEGER REFERENCES authors(id) ON DELETE CASCADE
|
|
||||||
);
|
|
||||||
""")
|
|
||||||
fresh_db["authors"].insert({"id": 1, "name": "Ursula K. Le Guin"})
|
|
||||||
fresh_db["books"].insert({"id": 1, "title": "The Dispossessed", "author_id": 1})
|
|
||||||
with fresh_db.atomic():
|
|
||||||
fresh_db["books"].transform(rename={"title": "book_title"})
|
|
||||||
assert list(fresh_db["books"].rows) == [
|
|
||||||
{"id": 1, "book_title": "The Dispossessed", "author_id": 1}
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def test_transform_in_transaction_allowed_with_foreign_keys_off(fresh_db):
|
|
||||||
# With PRAGMA foreign_keys off (the default) no cascades can fire, so
|
|
||||||
# transform inside a transaction is safe even with a CASCADE schema
|
|
||||||
fresh_db.executescript("""
|
|
||||||
CREATE TABLE authors (id INTEGER PRIMARY KEY, name TEXT);
|
|
||||||
CREATE TABLE books (
|
|
||||||
id INTEGER PRIMARY KEY,
|
|
||||||
title TEXT,
|
|
||||||
author_id INTEGER REFERENCES authors(id) ON DELETE CASCADE
|
|
||||||
);
|
|
||||||
""")
|
|
||||||
fresh_db["authors"].insert({"id": 1, "name": "Ursula K. Le Guin"})
|
|
||||||
fresh_db["books"].insert({"id": 1, "title": "The Dispossessed", "author_id": 1})
|
|
||||||
with fresh_db.atomic():
|
|
||||||
fresh_db["authors"].transform(rename={"name": "author_name"})
|
|
||||||
assert list(fresh_db["books"].rows) == [
|
|
||||||
{"id": 1, "title": "The Dispossessed", "author_id": 1}
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def test_transform_add_foreign_keys_from_scratch(fresh_db):
|
def test_transform_add_foreign_keys_from_scratch(fresh_db):
|
||||||
_add_country_city_continent(fresh_db)
|
_add_country_city_continent(fresh_db)
|
||||||
fresh_db["places"].insert(_CAVEAU)
|
fresh_db["places"].insert(_CAVEAU)
|
||||||
|
|
@ -714,75 +554,25 @@ def test_transform_preserves_rowids(fresh_db, table_type):
|
||||||
# Now delete and insert a row to mix up the `rowid` sequence
|
# Now delete and insert a row to mix up the `rowid` sequence
|
||||||
fresh_db["places"].delete_where("id = ?", ["2"])
|
fresh_db["places"].delete_where("id = ?", ["2"])
|
||||||
fresh_db["places"].insert({"id": "4", "name": "London", "country": "UK"})
|
fresh_db["places"].insert({"id": "4", "name": "London", "country": "UK"})
|
||||||
previous_rows = [
|
previous_rows = list(
|
||||||
tuple(row) for row in fresh_db.execute("select rowid, id, name from places")
|
tuple(row) for row in fresh_db.execute("select rowid, id, name from places")
|
||||||
]
|
)
|
||||||
# Transform it
|
# Transform it
|
||||||
fresh_db["places"].transform(column_order=("country", "name"))
|
fresh_db["places"].transform(column_order=("country", "name"))
|
||||||
# Should be the same
|
# Should be the same
|
||||||
next_rows = [
|
next_rows = list(
|
||||||
tuple(row) for row in fresh_db.execute("select rowid, id, name from places")
|
tuple(row) for row in fresh_db.execute("select rowid, id, name from places")
|
||||||
]
|
)
|
||||||
assert previous_rows == next_rows
|
assert previous_rows == next_rows
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize("strict", (False, True))
|
||||||
"initial_strict,transform_strict,expected_strict",
|
def test_transform_strict(fresh_db, strict):
|
||||||
(
|
dogs = fresh_db.table("dogs", strict=strict)
|
||||||
(False, None, False),
|
|
||||||
(True, None, True),
|
|
||||||
(False, True, True),
|
|
||||||
(True, False, False),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
def test_transform_strict(fresh_db, initial_strict, transform_strict, expected_strict):
|
|
||||||
if not fresh_db.supports_strict:
|
|
||||||
pytest.skip("SQLite version does not support strict tables")
|
|
||||||
dogs = fresh_db.table("dogs", strict=initial_strict)
|
|
||||||
dogs.insert({"id": 1, "name": "Cleo"})
|
dogs.insert({"id": 1, "name": "Cleo"})
|
||||||
assert dogs.strict is initial_strict
|
assert dogs.strict == strict or not fresh_db.supports_strict
|
||||||
dogs.transform(strict=transform_strict)
|
dogs.transform(not_null={"name"})
|
||||||
assert dogs.strict is expected_strict
|
assert dogs.strict == strict or not fresh_db.supports_strict
|
||||||
|
|
||||||
|
|
||||||
def test_transform_to_strict_with_invalid_data(fresh_db):
|
|
||||||
if not fresh_db.supports_strict:
|
|
||||||
pytest.skip("SQLite version does not support strict tables")
|
|
||||||
dogs = fresh_db["dogs"]
|
|
||||||
dogs.create({"id": int})
|
|
||||||
dogs.insert({"id": "not-an-integer"})
|
|
||||||
|
|
||||||
with pytest.raises(sqlite3.IntegrityError):
|
|
||||||
dogs.transform(strict=True)
|
|
||||||
|
|
||||||
assert dogs.strict is False
|
|
||||||
assert list(dogs.rows) == [{"id": "not-an-integer"}]
|
|
||||||
assert fresh_db.table_names() == ["dogs"]
|
|
||||||
|
|
||||||
|
|
||||||
def test_transform_strict_updates_default(fresh_db):
|
|
||||||
if not fresh_db.supports_strict:
|
|
||||||
pytest.skip("SQLite version does not support strict tables")
|
|
||||||
table = fresh_db.table("items", strict=True)
|
|
||||||
table.create({"id": int})
|
|
||||||
|
|
||||||
table.transform(strict=False)
|
|
||||||
assert table.strict is False
|
|
||||||
|
|
||||||
table.create({"id": int}, replace=True)
|
|
||||||
assert table.strict is False
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("method_name", ("transform", "transform_sql"))
|
|
||||||
def test_transform_to_strict_not_supported(fresh_db, method_name):
|
|
||||||
table = fresh_db["items"]
|
|
||||||
table.create({"id": int})
|
|
||||||
fresh_db._supports_strict = False
|
|
||||||
|
|
||||||
with pytest.raises(TransformError, match="SQLite does not support STRICT tables"):
|
|
||||||
getattr(table, method_name)(strict=True)
|
|
||||||
|
|
||||||
assert table.strict is False
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ def test_update_compound_pk_table(fresh_db):
|
||||||
)
|
)
|
||||||
def test_update_invalid_pk(fresh_db, pk, update_pk):
|
def test_update_invalid_pk(fresh_db, pk, update_pk):
|
||||||
table = fresh_db["table"]
|
table = fresh_db["table"]
|
||||||
table.insert({"id1": 5, "id2": 3, "v": 1}, pk=pk)
|
table.insert({"id1": 5, "id2": 3, "v": 1}, pk=pk).last_pk
|
||||||
with pytest.raises(NotFoundError):
|
with pytest.raises(NotFoundError):
|
||||||
table.update(update_pk, {"v": 2})
|
table.update(update_pk, {"v": 2})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import pytest
|
|
||||||
|
|
||||||
from sqlite_utils import Database
|
|
||||||
from sqlite_utils.db import PrimaryKeyRequired
|
from sqlite_utils.db import PrimaryKeyRequired
|
||||||
|
from sqlite_utils import Database
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("use_old_upsert", (False, True))
|
@pytest.mark.parametrize("use_old_upsert", (False, True))
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
|
from sqlite_utils import utils
|
||||||
import csv
|
import csv
|
||||||
import io
|
import io
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils import utils
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"input,expected,should_be_is",
|
"input,expected,should_be_is",
|
||||||
|
|
@ -59,7 +57,7 @@ def test_maximize_csv_field_size_limit():
|
||||||
# Reset to default in case other tests have changed it
|
# Reset to default in case other tests have changed it
|
||||||
csv.field_size_limit(utils.ORIGINAL_CSV_FIELD_SIZE_LIMIT)
|
csv.field_size_limit(utils.ORIGINAL_CSV_FIELD_SIZE_LIMIT)
|
||||||
long_value = "a" * 131073
|
long_value = "a" * 131073
|
||||||
long_csv = f"id,text\n1,{long_value}"
|
long_csv = "id,text\n1,{}".format(long_value)
|
||||||
fp = io.BytesIO(long_csv.encode("utf-8"))
|
fp = io.BytesIO(long_csv.encode("utf-8"))
|
||||||
# Using rows_from_file should error
|
# Using rows_from_file should error
|
||||||
with pytest.raises(csv.Error):
|
with pytest.raises(csv.Error):
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from sqlite_utils import Database
|
from sqlite_utils import Database
|
||||||
from sqlite_utils.db import TransactionError
|
from sqlite_utils.db import TransactionError
|
||||||
|
|
||||||
|
|
@ -12,7 +11,7 @@ def db_path_tmpdir(tmpdir):
|
||||||
|
|
||||||
|
|
||||||
def test_enable_disable_wal(db_path_tmpdir):
|
def test_enable_disable_wal(db_path_tmpdir):
|
||||||
db, _path, tmpdir = db_path_tmpdir
|
db, path, tmpdir = db_path_tmpdir
|
||||||
assert len(tmpdir.listdir()) == 1
|
assert len(tmpdir.listdir()) == 1
|
||||||
assert "delete" == db.journal_mode
|
assert "delete" == db.journal_mode
|
||||||
assert "test.db-wal" not in [f.basename for f in tmpdir.listdir()]
|
assert "test.db-wal" not in [f.basename for f in tmpdir.listdir()]
|
||||||
|
|
@ -26,11 +25,12 @@ def test_enable_disable_wal(db_path_tmpdir):
|
||||||
|
|
||||||
|
|
||||||
def test_enable_wal_inside_transaction_raises(db_path_tmpdir):
|
def test_enable_wal_inside_transaction_raises(db_path_tmpdir):
|
||||||
db, _path, _tmpdir = db_path_tmpdir
|
db, path, tmpdir = db_path_tmpdir
|
||||||
db["test"].insert({"id": 1}, pk="id")
|
db["test"].insert({"id": 1}, pk="id")
|
||||||
with pytest.raises(TransactionError), db.atomic():
|
with pytest.raises(TransactionError):
|
||||||
db["test"].insert({"id": 2}, pk="id")
|
with db.atomic():
|
||||||
db.enable_wal()
|
db["test"].insert({"id": 2}, pk="id")
|
||||||
|
db.enable_wal()
|
||||||
# The atomic() block must have rolled back cleanly and the
|
# The atomic() block must have rolled back cleanly and the
|
||||||
# journal mode must be unchanged
|
# journal mode must be unchanged
|
||||||
assert db.journal_mode == "delete"
|
assert db.journal_mode == "delete"
|
||||||
|
|
@ -38,18 +38,19 @@ def test_enable_wal_inside_transaction_raises(db_path_tmpdir):
|
||||||
|
|
||||||
|
|
||||||
def test_disable_wal_inside_transaction_raises(db_path_tmpdir):
|
def test_disable_wal_inside_transaction_raises(db_path_tmpdir):
|
||||||
db, _path, _tmpdir = db_path_tmpdir
|
db, path, tmpdir = db_path_tmpdir
|
||||||
db.enable_wal()
|
db.enable_wal()
|
||||||
db["test"].insert({"id": 1}, pk="id")
|
db["test"].insert({"id": 1}, pk="id")
|
||||||
with pytest.raises(TransactionError), db.atomic():
|
with pytest.raises(TransactionError):
|
||||||
db["test"].insert({"id": 2}, pk="id")
|
with db.atomic():
|
||||||
db.disable_wal()
|
db["test"].insert({"id": 2}, pk="id")
|
||||||
|
db.disable_wal()
|
||||||
assert db.journal_mode == "wal"
|
assert db.journal_mode == "wal"
|
||||||
assert [r["id"] for r in db["test"].rows] == [1]
|
assert [r["id"] for r in db["test"].rows] == [1]
|
||||||
|
|
||||||
|
|
||||||
def test_ensure_autocommit_on(db_path_tmpdir):
|
def test_ensure_autocommit_on(db_path_tmpdir):
|
||||||
db, _path, _tmpdir = db_path_tmpdir
|
db, path, tmpdir = db_path_tmpdir
|
||||||
previous_isolation_level = db.conn.isolation_level
|
previous_isolation_level = db.conn.isolation_level
|
||||||
assert previous_isolation_level is not None
|
assert previous_isolation_level is not None
|
||||||
with db.ensure_autocommit_on():
|
with db.ensure_autocommit_on():
|
||||||
|
|
@ -62,7 +63,7 @@ def test_ensure_autocommit_on(db_path_tmpdir):
|
||||||
def test_enable_wal_noop_inside_transaction_is_allowed(db_path_tmpdir):
|
def test_enable_wal_noop_inside_transaction_is_allowed(db_path_tmpdir):
|
||||||
# Calling enable_wal() when WAL is already enabled is a no-op,
|
# Calling enable_wal() when WAL is already enabled is a no-op,
|
||||||
# so it is fine inside a transaction
|
# so it is fine inside a transaction
|
||||||
db, _path, _tmpdir = db_path_tmpdir
|
db, path, tmpdir = db_path_tmpdir
|
||||||
db.enable_wal()
|
db.enable_wal()
|
||||||
with db.atomic():
|
with db.atomic():
|
||||||
db["test"].insert({"id": 1}, pk="id")
|
db["test"].insert({"id": 1}, pk="id")
|
||||||
|
|
@ -74,12 +75,13 @@ def test_ensure_autocommit_on_inside_transaction_raises(db_path_tmpdir):
|
||||||
# Setting isolation_level commits any pending transaction as a side
|
# Setting isolation_level commits any pending transaction as a side
|
||||||
# effect, silently breaking the caller's rollback guarantee - so
|
# effect, silently breaking the caller's rollback guarantee - so
|
||||||
# entering autocommit mode with a transaction open is an error
|
# entering autocommit mode with a transaction open is an error
|
||||||
db, _path, _tmpdir = db_path_tmpdir
|
db, path, tmpdir = db_path_tmpdir
|
||||||
db["test"].insert({"id": 1}, pk="id")
|
db["test"].insert({"id": 1}, pk="id")
|
||||||
db.begin()
|
db.begin()
|
||||||
db.execute("insert into test (id) values (2)")
|
db.execute("insert into test (id) values (2)")
|
||||||
with pytest.raises(TransactionError), db.ensure_autocommit_on():
|
with pytest.raises(TransactionError):
|
||||||
pass
|
with db.ensure_autocommit_on():
|
||||||
|
pass
|
||||||
# The transaction is still open and can still be rolled back
|
# The transaction is still open and can still be rolled back
|
||||||
assert db.conn.in_transaction
|
assert db.conn.in_transaction
|
||||||
db.rollback()
|
db.rollback()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue