iterdump() workaround for compatibility with pysqlite3

This commit is contained in:
Simon Willison 2021-11-29 15:29:23 -08:00
commit c91f1e6957
3 changed files with 7 additions and 4 deletions

View file

@ -19,6 +19,7 @@ import tabulate
from .utils import (
file_progress,
find_spatialite,
iterdump,
sqlite3,
decode_base64_values,
progressbar,
@ -326,7 +327,7 @@ def dump(path, load_extension):
"""Output a SQL dump of the schema and full contents of the database"""
db = sqlite_utils.Database(path)
_load_extensions(db, load_extension)
for line in db.conn.iterdump():
for line in iterdump(db.conn):
click.echo(line)
@ -1320,7 +1321,7 @@ def memory(
return
if dump:
for line in db.conn.iterdump():
for line in iterdump(db.conn):
click.echo(line)
return
@ -1330,7 +1331,7 @@ def memory(
if save:
db2 = sqlite_utils.Database(save)
for line in db.conn.iterdump():
for line in iterdump(db.conn):
db2.execute(line)
return

View file

@ -5,6 +5,7 @@ import enum
import io
import json
import os
from sqlite3.dump import _iterdump as iterdump
from typing import cast, BinaryIO, Iterable, Optional, Tuple, Type
import click

View file

@ -1,5 +1,6 @@
from sqlite_utils.db import Database, ColumnDetails
from sqlite_utils import cli
from sqlite_utils.utils import iterdump
from click.testing import CliRunner
import pytest
import sqlite3
@ -79,7 +80,7 @@ def test_analyze_column(db_to_analyze, column, expected):
def db_to_analyze_path(db_to_analyze, tmpdir):
path = str(tmpdir / "test.db")
db = sqlite3.connect(path)
db.executescript("\n".join(db_to_analyze.conn.iterdump()))
db.executescript("\n".join(iterdump(db_to_analyze.conn)))
return path