Skip to content

Commit

Permalink
Lastrowid, lastsql, lastescapes attributes added to SQLite connection.
Browse files Browse the repository at this point in the history
  • Loading branch information
kasun committed Apr 1, 2012
1 parent 6e7bd3c commit edaaf78
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
17 changes: 17 additions & 0 deletions beesql/backends/sqlite.py
Expand Up @@ -38,6 +38,8 @@ def query(self, sql, escapes=None):
sql: Query to run.
escapes: Optional, A tuple of escape values to escape provided sql. '''
try:
self.last_sql = sql
self.last_escapes = escapes
return self.run_query(sql, escapes)
except sqlite3.OperationalError, oe:
raise BeeSQLDatabaseError(str(oe))
Expand Down Expand Up @@ -188,6 +190,21 @@ def drop_table(self, table, **kargs):
sql = sql + table
self.query(sql)

@property
def lastrowid(self):
''' Return row ID of last insert. '''
return self.cursor.lastrowid

@property
def lastsql(self):
''' Return last run sql statement. '''
return self.last_sql

@property
def lastescapes(self):
''' Return lastly used escape values as a tuple. '''
return self.last_escapes

def close(self):
''' Close connection to Databaes. '''
self.db_connection.close()
33 changes: 33 additions & 0 deletions tests/test_sqlite.py
Expand Up @@ -83,6 +83,20 @@ def test_delete(self):
self.assertEqual(self.db.run_query.call_args[0][0].lower(), "DELETE FROM beesql_version WHERE version=? and release_name=?".lower())
self.assertEqual(self.db.run_query.call_args[0][1], (2.0, 'bumblebee'))

def test_transaction(self):
''' When in a transaction auto commit should be false. '''
self.db.query("""CREATE TABLE beesql_version(
id INTEGER PRIMARY_KEY,
version VARCHAR(10),
release_manager VARCHAR(100))""")
self.db.insert('beesql_version', id=1, version='0.1.1', release_manager='John Doe')
self.db.transaction_on()
updates = {'release_manager': 'John Smith'}
self.db.update('beesql_version', updates, release_manager='John Doe')
self.db.rollback()
row = self.db.select('beesql_version', where="id=1")[0]
self.assertNotEqual(row['release_manager'], updates['release_manager'])

def test_tables(self):
''' tables should return tables of current database as a list. '''
self.db.query("""CREATE TABLE beesql_version(
Expand All @@ -101,6 +115,25 @@ def test_droptable(self):
self.db.drop_table('beesql_version', if_exists=True)
self.assertEqual(self.db.run_query.call_args[0][0].lower(), "DROP TABLE IF EXISTS beesql_version".lower())

def test_lastrowid(self):
''' Attribute lastrowid should be equal to last row id of insert statement. '''
self.db.query("""CREATE TABLE beesql_version(
id INTEGER PRIMARY_KEY,
version VARCHAR(10),
release_manager VARCHAR(100))""")
self.db.insert('beesql_version', id=1, version='0.1.1', release_manager='John Doe')
self.assertEqual(self.db.lastrowid, 1)

def test_lastsqlandescapes(self):
''' Attributes lastsql and lastescapes should be equal to lastly run sql and escapes used. '''
self.db.query("""CREATE TABLE beesql_version(
id INTEGER PRIMARY_KEY,
version VARCHAR(10),
release_manager VARCHAR(100))""")
self.db.insert('beesql_version', id=1, version='0.1.1', release_manager='John Doe')
self.assertEqual(self.db.lastsql.lower(), 'INSERT INTO beesql_version (release_manager, version, id) VALUES (?, ?, ?)'.lower())
self.assertEqual(self.db.lastescapes, ('John Doe', '0.1.1', 1))

def tearDown(self):
self.db.close()

Expand Down

0 comments on commit edaaf78

Please sign in to comment.