mirror of
https://github.com/psycopg/psycopg2.git
synced 2025-08-04 04:10:09 +03:00
Merge d9a6c63735
into 914ccbacb5
This commit is contained in:
commit
5d1a6ef8df
|
@ -340,7 +340,7 @@ class ParseDsnTestCase(ConnectingTestCase):
|
||||||
|
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
ext.parse_dsn('dbname=test user=tester password=secret'),
|
ext.parse_dsn('dbname=test user=tester password=secret'),
|
||||||
dict(user='tester', password='secret', dbname='test'),
|
{'user': 'tester', 'password': 'secret', 'dbname': 'test'},
|
||||||
"simple DSN parsed")
|
"simple DSN parsed")
|
||||||
|
|
||||||
self.assertRaises(ProgrammingError, ext.parse_dsn,
|
self.assertRaises(ProgrammingError, ext.parse_dsn,
|
||||||
|
@ -348,7 +348,7 @@ class ParseDsnTestCase(ConnectingTestCase):
|
||||||
|
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
ext.parse_dsn("dbname='test 2' user=tester password=secret"),
|
ext.parse_dsn("dbname='test 2' user=tester password=secret"),
|
||||||
dict(user='tester', password='secret', dbname='test 2'),
|
{'user': 'tester', 'password': 'secret', 'dbname': 'test 2'},
|
||||||
"DSN with quoting parsed")
|
"DSN with quoting parsed")
|
||||||
|
|
||||||
# Can't really use assertRaisesRegexp() here since we need to
|
# Can't really use assertRaisesRegexp() here since we need to
|
||||||
|
@ -369,7 +369,7 @@ class ParseDsnTestCase(ConnectingTestCase):
|
||||||
@skip_before_libpq(9, 2)
|
@skip_before_libpq(9, 2)
|
||||||
def test_parse_dsn_uri(self):
|
def test_parse_dsn_uri(self):
|
||||||
self.assertEqual(ext.parse_dsn('postgresql://tester:secret@/test'),
|
self.assertEqual(ext.parse_dsn('postgresql://tester:secret@/test'),
|
||||||
dict(user='tester', password='secret', dbname='test'),
|
{'user': 'tester', 'password': 'secret', 'dbname': 'test'},
|
||||||
"valid URI dsn parsed")
|
"valid URI dsn parsed")
|
||||||
|
|
||||||
raised = False
|
raised = False
|
||||||
|
|
|
@ -154,7 +154,7 @@ class TestExecuteValues(FastExecuteTestMixin, testutils.ConnectingTestCase):
|
||||||
cur = self.conn.cursor()
|
cur = self.conn.cursor()
|
||||||
psycopg2.extras.execute_values(cur,
|
psycopg2.extras.execute_values(cur,
|
||||||
"insert into testfast (id, date, val) values %s",
|
"insert into testfast (id, date, val) values %s",
|
||||||
(dict(id=i, date=date(2017, 1, i + 1), val=i * 10, foo="bar")
|
({'id': i, 'date': date(2017, 1, i + 1), 'val': i * 10, 'foo': "bar"}
|
||||||
for i in range(10)),
|
for i in range(10)),
|
||||||
template='(%(id)s, %(date)s, %(val)s)')
|
template='(%(id)s, %(date)s, %(val)s)')
|
||||||
cur.execute("select id, date, val from testfast order by id")
|
cur.execute("select id, date, val from testfast order by id")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user