mirror of
https://github.com/simonw/sqlite-utils.git
synced 2026-09-27 20:34:12 +02:00
iterdump() workaround for compatibility with pysqlite3
This commit is contained in:
parent
e02c8f35d4
commit
c91f1e6957
3 changed files with 7 additions and 4 deletions
|
|
@ -19,6 +19,7 @@ import tabulate
|
||||||
from .utils import (
|
from .utils import (
|
||||||
file_progress,
|
file_progress,
|
||||||
find_spatialite,
|
find_spatialite,
|
||||||
|
iterdump,
|
||||||
sqlite3,
|
sqlite3,
|
||||||
decode_base64_values,
|
decode_base64_values,
|
||||||
progressbar,
|
progressbar,
|
||||||
|
|
@ -326,7 +327,7 @@ def dump(path, load_extension):
|
||||||
"""Output a SQL dump of the schema and full contents of the database"""
|
"""Output a SQL dump of the schema and full contents of the database"""
|
||||||
db = sqlite_utils.Database(path)
|
db = sqlite_utils.Database(path)
|
||||||
_load_extensions(db, load_extension)
|
_load_extensions(db, load_extension)
|
||||||
for line in db.conn.iterdump():
|
for line in iterdump(db.conn):
|
||||||
click.echo(line)
|
click.echo(line)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1320,7 +1321,7 @@ def memory(
|
||||||
return
|
return
|
||||||
|
|
||||||
if dump:
|
if dump:
|
||||||
for line in db.conn.iterdump():
|
for line in iterdump(db.conn):
|
||||||
click.echo(line)
|
click.echo(line)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
@ -1330,7 +1331,7 @@ def memory(
|
||||||
|
|
||||||
if save:
|
if save:
|
||||||
db2 = sqlite_utils.Database(save)
|
db2 = sqlite_utils.Database(save)
|
||||||
for line in db.conn.iterdump():
|
for line in iterdump(db.conn):
|
||||||
db2.execute(line)
|
db2.execute(line)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import enum
|
||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
from sqlite3.dump import _iterdump as iterdump
|
||||||
from typing import cast, BinaryIO, Iterable, Optional, Tuple, Type
|
from typing import cast, BinaryIO, Iterable, Optional, Tuple, Type
|
||||||
|
|
||||||
import click
|
import click
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
from sqlite_utils.db import Database, ColumnDetails
|
from sqlite_utils.db import Database, ColumnDetails
|
||||||
from sqlite_utils import cli
|
from sqlite_utils import cli
|
||||||
|
from sqlite_utils.utils import iterdump
|
||||||
from click.testing import CliRunner
|
from click.testing import CliRunner
|
||||||
import pytest
|
import pytest
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
|
@ -79,7 +80,7 @@ def test_analyze_column(db_to_analyze, column, expected):
|
||||||
def db_to_analyze_path(db_to_analyze, tmpdir):
|
def db_to_analyze_path(db_to_analyze, tmpdir):
|
||||||
path = str(tmpdir / "test.db")
|
path = str(tmpdir / "test.db")
|
||||||
db = sqlite3.connect(path)
|
db = sqlite3.connect(path)
|
||||||
db.executescript("\n".join(db_to_analyze.conn.iterdump()))
|
db.executescript("\n".join(iterdump(db_to_analyze.conn)))
|
||||||
return path
|
return path
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue