Context Navigation

sqlite3

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

python/trunk
- Property svn:mergeinfo set to
  /python/vendor/Python-2.7.6 merged eligible
  /python/vendor/current merged eligible

r2	r391
24	24	if buffer.lstrip().upper().startswith("SELECT"):
25	25	print cur.fetchall()
26		except sqlite3.Error, e:
	26	except sqlite3.Error as e:
27	27	print "An error occurred:", e.args[0]
28	28	buffer = ""

r2	r391
9	9
10	10	# con.rollback() is called after the with block finishes with an exception, the
11		# exception is still raised and must be ca~~tched~~
	11	# exception is still raised and must be caught
12	12	try:
13	13	with con:

-              r2
+              r391
 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()

-              r2
+              r391
 import sqlite3
+import string
 def char_generator():
+    import string
+    for c in string.letters[:26]:
+    for c in string.lowercase:
         yield (c,)

-              r2
+              r391
 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"]

r2	r391
2	2
3	3	# The shared cache is only available in SQLite versions 3.3.3 or later
4		# See the SQLite documentaton for details.
	4	# See the SQLite documentation for details.
5	5
6	6	sqlite3.enable_shared_cache(True)

r2	r391
18	18	print row
19	19
20		# Using a dummy WHERE clause to not let SQLite take the shortcut table deletes.
21		print "I just deleted", con.execute("delete from person where 1=1").rowcount, "rows"
	20	print "I just deleted", con.execute("delete from person").rowcount, "rows"

-              r2
+              r391
 con = sqlite3.connect(":memory:")
 cur = con.cursor()
-# Create the table
-con.execute("create table person(lastname, firstname)")
 AUSTRIA = u"\xd6sterreich"
 …
 cur.execute("select ?", (AUSTRIA,))
 row = cur.fetchone()
 assert type(row[0]) == str
+assert type(row[0]) is str
 # the bytestrings will be encoded in UTF-8, unless you stored garbage in the
 # database ...
 …
                          u"\xe4\xf6\xfc".encode("latin1"),))
 row = cur.fetchone()
 assert type(row[0]) == unicode
+assert type(row[0]) is unicode
 # sqlite3 offers a built-in optimized text_factory that will return bytestring
 …
 cur.execute("select ?", (AUSTRIA,))
 row = cur.fetchone()
 assert type(row[0]) == unicode
+assert type(row[0]) is unicode
 cur.execute("select ?", ("Germany",))
 row = cur.fetchone()
 assert type(row[0]) == str
+assert type(row[0]) is str

Note: See TracChangeset for help on using the changeset viewer.

/python/vendor/Python-2.7.6	merged	eligible
/python/vendor/current	merged	eligible