Issue #13491: Fix many errors in sqlite3 documentation
Initial patch by Johannes Vogel.
This commit is contained in:
parent
2640b52237
commit
1ca93954e1
|
@ -8,10 +8,10 @@ class Point:
|
|||
return "(%f;%f)" % (self.x, self.y)
|
||||
|
||||
def adapt_point(point):
|
||||
return "%f;%f" % (point.x, point.y)
|
||||
return ("%f;%f" % (point.x, point.y)).encode('ascii')
|
||||
|
||||
def convert_point(s):
|
||||
x, y = list(map(float, s.split(";")))
|
||||
x, y = list(map(float, s.split(b";")))
|
||||
return Point(x, y)
|
||||
|
||||
# Register the adapter
|
||||
|
|
|
@ -1,11 +1,16 @@
|
|||
import sqlite3
|
||||
|
||||
con = sqlite3.connect("mydb")
|
||||
|
||||
con = sqlite3.connect(":memory:")
|
||||
cur = con.cursor()
|
||||
cur.execute("create table people (name_last, age)")
|
||||
|
||||
who = "Yeltsin"
|
||||
age = 72
|
||||
|
||||
cur.execute("select name_last, age from people where name_last=? and age=?", (who, age))
|
||||
# This is the qmark style:
|
||||
cur.execute("insert into people values (?, ?)", (who, age))
|
||||
|
||||
# And this is the named style:
|
||||
cur.execute("select * from people where name_last=:who and age=:age", {"who": who, "age": age})
|
||||
|
||||
print(cur.fetchone())
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
import sqlite3
|
||||
|
||||
con = sqlite3.connect("mydb")
|
||||
|
||||
cur = con.cursor()
|
||||
|
||||
who = "Yeltsin"
|
||||
age = 72
|
||||
|
||||
cur.execute("select name_last, age from people where name_last=:who and age=:age",
|
||||
{"who": who, "age": age})
|
||||
print(cur.fetchone())
|
|
@ -1,8 +1,8 @@
|
|||
import sqlite3
|
||||
import string
|
||||
|
||||
def char_generator():
|
||||
import string
|
||||
for c in string.letters[:26]:
|
||||
for c in string.ascii_lowercase:
|
||||
yield (c,)
|
||||
|
||||
con = sqlite3.connect(":memory:")
|
||||
|
|
|
@ -7,5 +7,5 @@ def md5sum(t):
|
|||
con = sqlite3.connect(":memory:")
|
||||
con.create_function("md5", 1, md5sum)
|
||||
cur = con.cursor()
|
||||
cur.execute("select md5(?)", ("foo",))
|
||||
cur.execute("select md5(?)", (b"foo",))
|
||||
print(cur.fetchone()[0])
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
import sqlite3
|
||||
|
||||
con = sqlite3.connect("mydb")
|
||||
con = sqlite3.connect(":memory:")
|
||||
con.row_factory = sqlite3.Row
|
||||
|
||||
cur = con.cursor()
|
||||
cur.execute("select name_last, age from people")
|
||||
cur.execute("select 'John' as name, 42 as age")
|
||||
for row in cur:
|
||||
assert row[0] == row["name_last"]
|
||||
assert row["name_last"] == row["nAmE_lAsT"]
|
||||
assert row[0] == row["name"]
|
||||
assert row["name"] == row["nAmE"]
|
||||
assert row[1] == row["age"]
|
||||
assert row[1] == row["AgE"]
|
||||
|
|
|
@ -3,9 +3,6 @@ import sqlite3
|
|||
con = sqlite3.connect(":memory:")
|
||||
cur = con.cursor()
|
||||
|
||||
# Create the table
|
||||
con.execute("create table person(lastname, firstname)")
|
||||
|
||||
AUSTRIA = "\xd6sterreich"
|
||||
|
||||
# by default, rows are returned as Unicode
|
||||
|
@ -14,30 +11,17 @@ row = cur.fetchone()
|
|||
assert row[0] == AUSTRIA
|
||||
|
||||
# but we can make sqlite3 always return bytestrings ...
|
||||
con.text_factory = str
|
||||
con.text_factory = bytes
|
||||
cur.execute("select ?", (AUSTRIA,))
|
||||
row = cur.fetchone()
|
||||
assert type(row[0]) == str
|
||||
assert type(row[0]) is bytes
|
||||
# the bytestrings will be encoded in UTF-8, unless you stored garbage in the
|
||||
# database ...
|
||||
assert row[0] == AUSTRIA.encode("utf-8")
|
||||
|
||||
# we can also implement a custom text_factory ...
|
||||
# here we implement one that will ignore Unicode characters that cannot be
|
||||
# decoded from UTF-8
|
||||
con.text_factory = lambda x: str(x, "utf-8", "ignore")
|
||||
cur.execute("select ?", ("this is latin1 and would normally create errors" +
|
||||
"\xe4\xf6\xfc".encode("latin1"),))
|
||||
# here we implement one that appends "foo" to all strings
|
||||
con.text_factory = lambda x: x.decode("utf-8") + "foo"
|
||||
cur.execute("select ?", ("bar",))
|
||||
row = cur.fetchone()
|
||||
assert type(row[0]) == str
|
||||
|
||||
# sqlite3 offers a built-in optimized text_factory that will return bytestring
|
||||
# objects, if the data is in ASCII only, and otherwise return unicode objects
|
||||
con.text_factory = sqlite3.OptimizedUnicode
|
||||
cur.execute("select ?", (AUSTRIA,))
|
||||
row = cur.fetchone()
|
||||
assert type(row[0]) == str
|
||||
|
||||
cur.execute("select ?", ("Germany",))
|
||||
row = cur.fetchone()
|
||||
assert type(row[0]) == str
|
||||
assert row[0] == "barfoo"
|
||||
|
|
|
@ -472,14 +472,10 @@ Cursor Objects
|
|||
kinds of placeholders: question marks (qmark style) and named placeholders
|
||||
(named style).
|
||||
|
||||
This example shows how to use parameters with qmark style:
|
||||
Here's an example of both styles:
|
||||
|
||||
.. literalinclude:: ../includes/sqlite3/execute_1.py
|
||||
|
||||
This example shows how to use the named style:
|
||||
|
||||
.. literalinclude:: ../includes/sqlite3/execute_2.py
|
||||
|
||||
:meth:`execute` will only execute a single SQL statement. If you try to execute
|
||||
more than one statement with it, it will raise a Warning. Use
|
||||
:meth:`executescript` if you want to execute multiple SQL statements with one
|
||||
|
@ -761,7 +757,7 @@ and constructs a :class:`Point` object from it.
|
|||
::
|
||||
|
||||
def convert_point(s):
|
||||
x, y = map(float, s.split(";"))
|
||||
x, y = map(float, s.split(b";"))
|
||||
return Point(x, y)
|
||||
|
||||
Now you need to make the :mod:`sqlite3` module know that what you select from
|
||||
|
|
|
@ -956,6 +956,7 @@ Kannan Vijayan
|
|||
Kurt Vile
|
||||
Norman Vine
|
||||
Frank Visser
|
||||
Johannes Vogel
|
||||
Sjoerd de Vries
|
||||
Niki W. Waibel
|
||||
Wojtek Walczak
|
||||
|
|
Loading…
Reference in New Issue