remote/sqlite-utils
1
0
Fork 0
mirror of https://github.com/simonw/sqlite-utils.git synced 2026-07-24 09:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Renamed db.escape() to db.quote() and documented it

Browse source 
Closes #217
This commit is contained in:
Simon Willison 2021-01-02 20:15:04 -08:00
commit 3d041d34d5
4 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sqlite_utils/cli.py
View file

@ -1127,7 +1127,7 @@ def triggers(
"Show triggers configured in this database"
sql = "select name, tbl_name as [table], sql from sqlite_master where type = 'trigger'"
if tables:
quote = sqlite_utils.Database(memory=True).escape
quote = sqlite_utils.Database(memory=True).quote
sql += " and [table] in ({})".format(
", ".join(quote(table) for table in tables)
)

10
sqlite_utils/db.py
View file

@ -228,7 +228,7 @@ class Database:
klass = View if table_name in self.view_names() else Table
return klass(self, table_name, **kwargs)
def escape(self, value):
def quote(self, value):
# Normally we would use .execute(sql, [params]) for escaping, but
# occasionally that isn't available - most notable when we need
# to include a "... DEFAULT 'value'" in a column definition.
@ -417,7 +417,7 @@ class Database:
column_extras.append("NOT NULL")
if column_name in defaults and defaults[column_name] is not None:
column_extras.append(
"DEFAULT {}".format(self.escape(defaults[column_name]))
"DEFAULT {}".format(self.quote(defaults[column_name]))
)
if column_name in foreign_keys_by_column:
column_extras.append(
@ -1107,9 +1107,7 @@ class Table(Queryable):
col_type = str
not_null_sql = None
if not_null_default is not None:
not_null_sql = "NOT NULL DEFAULT {}".format(
self.db.escape(not_null_default)
)
not_null_sql = "NOT NULL DEFAULT {}".format(self.db.quote(not_null_default))
sql = "ALTER TABLE [{table}] ADD COLUMN [{col_name}] {col_type}{not_null_default};".format(
table=self.name,
col_name=col_name,
@ -1227,7 +1225,7 @@ class Table(Queryable):
create_counts_table=self.db._counts_table_create,
counts_table=self.db._counts_table_name,
table=self.name,
table_quoted=self.db.escape(self.name),
table_quoted=self.db.quote(self.name),
)
)
with self.db.conn: