43c6f54e9f
svn+ssh://torsion.org/home/luminotes/repos/luminotes/branches/postgres
................
r402 | witten | 2007-10-04 00:48:49 -0700 (Thu, 04 Oct 2007) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-401" from
svn+ssh://torsion.org/home/luminotes/repos/luminotes/trunk
................
r404 | witten | 2007-10-04 01:17:07 -0700 (Thu, 04 Oct 2007) | 2 lines
Beginning a conversion from bsddb to postgres.
................
r405 | witten | 2007-10-04 01:18:58 -0700 (Thu, 04 Oct 2007) | 9 lines
Merged revisions 402-404 via svnmerge from
svn+ssh://torsion.org/home/luminotes/repos/luminotes/trunk
........
r403 | witten | 2007-10-04 01:14:45 -0700 (Thu, 04 Oct 2007) | 2 lines
Yay, no more stupid deprecation warnings from simplejson about the sre module.
........
................
r406 | witten | 2007-10-04 15:34:39 -0700 (Thu, 04 Oct 2007) | 4 lines
* Switched back to Python 2.4 because many Python modules in Debian are not packaged to work with Python 2.5
* Began removal of all references to Scheduler, @async, yield, and so on.
* Converted Database.py to support PostgreSQL and updated its unit tests accordingly.
................
r407 | witten | 2007-10-04 16:34:01 -0700 (Thu, 04 Oct 2007) | 2 lines
All unit tests for the new model classes now pass.
................
r409 | witten | 2007-10-05 00:53:56 -0700 (Fri, 05 Oct 2007) | 2 lines
Reordering some columns and adding some indices.
................
r410 | witten | 2007-10-05 16:08:37 -0700 (Fri, 05 Oct 2007) | 4 lines
Now adding trash notebooks to user_notebook table. Also switching db
conversion/verification tools back to require Python 2.5, since they still use
the old Scheduler, which requires 2.5 generator features.
................
r411 | witten | 2007-10-06 16:26:56 -0700 (Sat, 06 Oct 2007) | 2 lines
Lots more unit tests passing. Most of the recent work was on controller.Users and related stuff.
................
r412 | witten | 2007-10-07 01:52:12 -0700 (Sun, 07 Oct 2007) | 2 lines
controller.Users unit tests now finally pass!
................
r413 | witten | 2007-10-07 02:14:10 -0700 (Sun, 07 Oct 2007) | 3 lines
Got controller.Root unit tests passing.
Moved fake sql_* function shenanigans from Test_users.py to Test_controller.py, for use by other controller unit tests.
................
r414 | witten | 2007-10-08 23:11:11 -0700 (Mon, 08 Oct 2007) | 2 lines
All unit tests pass! Fuck yeah!
................
r415 | witten | 2007-10-08 23:13:07 -0700 (Mon, 08 Oct 2007) | 2 lines
Removing all references to Scheduler from luminotes.py
................
r416 | witten | 2007-10-08 23:54:51 -0700 (Mon, 08 Oct 2007) | 3 lines
Converted deleted_from to deleted_from_id in a few more places.
Fixed bug in Users.contents().
................
r417 | witten | 2007-10-09 00:11:59 -0700 (Tue, 09 Oct 2007) | 3 lines
Typo fix in Note sql method.
Adding autocommit flag to Database.next_id() method.
................
r418 | witten | 2007-10-09 00:13:19 -0700 (Tue, 09 Oct 2007) | 2 lines
Updating unit test for new auto commit flag.
................
r419 | witten | 2007-10-09 00:14:09 -0700 (Tue, 09 Oct 2007) | 2 lines
Removing debugging print.
................
r420 | witten | 2007-10-09 00:20:55 -0700 (Tue, 09 Oct 2007) | 2 lines
More sql fixes. I really need some funtional tests that hit the database and exercise the SQL.
................
r421 | witten | 2007-10-09 00:51:34 -0700 (Tue, 09 Oct 2007) | 3 lines
Fixed controller.Database handling of tuple as an Object_type.
Made SQL for user storage calculation better at handling null values and also more succinct.
................
r422 | witten | 2007-10-09 13:32:16 -0700 (Tue, 09 Oct 2007) | 2 lines
Converting Wiki.js to trash_id notebook member instead of trash object.
................
r423 | witten | 2007-10-09 13:42:10 -0700 (Tue, 09 Oct 2007) | 2 lines
No longer displaying "download as html" on the front page, as people see "download" and think they're downloading the software.
................
r424 | witten | 2007-10-09 14:24:40 -0700 (Tue, 09 Oct 2007) | 2 lines
Notebooks.contents() now returns notebooks with correct read-write status.
................
r425 | witten | 2007-10-09 14:32:25 -0700 (Tue, 09 Oct 2007) | 2 lines
Fixed reporting of validation errors to the user. Now says "The blah is missing." instead of just "is missing"
................
r426 | witten | 2007-10-09 17:05:22 -0700 (Tue, 09 Oct 2007) | 2 lines
No longer redirecting to trash notebook upon login.
................
r427 | witten | 2007-10-09 17:20:33 -0700 (Tue, 09 Oct 2007) | 2 lines
Made controller.Database use a connection pool.
................
r429 | witten | 2007-10-09 20:13:30 -0700 (Tue, 09 Oct 2007) | 2 lines
Converted initdb.py and updatedb.py to Postgres from bsddb.
................
r430 | witten | 2007-10-09 20:37:14 -0700 (Tue, 09 Oct 2007) | 2 lines
Changing error message to remove underscores from variable names.
................
r431 | witten | 2007-10-10 13:23:30 -0700 (Wed, 10 Oct 2007) | 2 lines
Removing unused note_title parameter from Wiki.create_editor().
................
r432 | witten | 2007-10-10 13:25:16 -0700 (Wed, 10 Oct 2007) | 2 lines
Revision regular expression now supports timezone notation.
................
r433 | witten | 2007-10-10 14:43:47 -0700 (Wed, 10 Oct 2007) | 2 lines
Finished implementing ranked ordering for startup notes. (However, there's no way to change the rank from the client yet.)
................
r434 | witten | 2007-10-10 16:25:19 -0700 (Wed, 10 Oct 2007) | 4 lines
More strict access checking. Fixed oversight in Postgres DB conversion where,
in certain controller.Notebook methods, access was only checked at the
notebook level, not at the note level as well.
................
r435 | witten | 2007-10-10 17:45:18 -0700 (Wed, 10 Oct 2007) | 3 lines
Now loading revisions on demand from client when the "changes" button is clicked. Also caching
loading revisions so subsequent clicks don't have to reload.
................
r436 | witten | 2007-10-10 21:31:20 -0700 (Wed, 10 Oct 2007) | 2 lines
Tweaking some of the error handling in Expose and Root so that unhandled errors give a generic error message to the client.
................
r437 | witten | 2007-10-10 21:33:49 -0700 (Wed, 10 Oct 2007) | 2 lines
The release script no longer runs initdb.py, because the default database is no longer a single file included in the tarball.
................
r438 | witten | 2007-10-10 21:40:11 -0700 (Wed, 10 Oct 2007) | 2 lines
Updated install instructuctions to include use of initdb.py.
................
r439 | witten | 2007-10-10 21:56:42 -0700 (Wed, 10 Oct 2007) | 3 lines
Made initdb.py only nuke (drop tables/views) when given a command-line flag.
Also made install directions more correct.
................
r440 | witten | 2007-10-10 21:58:48 -0700 (Wed, 10 Oct 2007) | 2 lines
IE 6 doesn't like commas.
................
r441 | witten | 2007-10-10 22:08:50 -0700 (Wed, 10 Oct 2007) | 4 lines
load your notebook. without clicking on "changes", edit a note that has previous revisions. click on "changes". it'll only show
the most recent revision. fixed by not appending to changes as a result of a save unless the client-side revisions list cache has
something in it
................
r442 | witten | 2007-10-10 23:30:41 -0700 (Wed, 10 Oct 2007) | 2 lines
Forgot to actually save off the new revision as editor.revision.
................
r443 | witten | 2007-10-11 01:35:54 -0700 (Thu, 11 Oct 2007) | 13 lines
More intelligent datetime handling:
* convertdb.py assumes old bsddb database timestamps are Pacific, and then
converts them to UTC before inserting them into the new PostgreSQL
database.
* No longer using naked timezoneless datetime objects in model/controller
code, except in unit tests that need compatability with pysqlite. Now
using UTC everwhere.
* Asking PostgreSQL to give us all timestamps back in UTC.
* New dependency on python-tz (pytz) package, noted in INSTALL doc.
* Client now responsible for converting UTC timestamps to local time for
display.
................
r444 | witten | 2007-10-11 01:46:09 -0700 (Thu, 11 Oct 2007) | 2 lines
Tweak to prevent potential race in IE.
................
r445 | witten | 2007-10-11 01:49:58 -0700 (Thu, 11 Oct 2007) | 2 lines
Got JavaScript "unit" tests passing again.
................
r446 | witten | 2007-10-11 01:53:58 -0700 (Thu, 11 Oct 2007) | 2 lines
Noting that js tests require the Luminotes server on localhost.
................
189 lines
6.6 KiB
Python
189 lines
6.6 KiB
Python
from pytz import utc
|
|
from pysqlite2 import dbapi2 as sqlite
|
|
from datetime import datetime
|
|
from Stub_object import Stub_object
|
|
from controller.Database import Database
|
|
|
|
|
|
class Test_database( object ):
|
|
def setUp( self ):
|
|
# make an in-memory sqlite database to use in place of PostgreSQL during testing
|
|
self.connection = sqlite.connect( ":memory:", detect_types = sqlite.PARSE_DECLTYPES | sqlite.PARSE_COLNAMES )
|
|
cursor = self.connection.cursor()
|
|
cursor.execute( Stub_object.sql_create_table() )
|
|
|
|
self.database = Database( self.connection )
|
|
|
|
def tearDown( self ):
|
|
self.database.close()
|
|
|
|
def test_save_and_load( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.save( basic_obj )
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj.object_id == basic_obj.object_id
|
|
assert obj.revision.replace( tzinfo = utc ) == original_revision
|
|
assert obj.value == basic_obj.value
|
|
|
|
def test_save_and_load_without_commit( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.save( basic_obj, commit = False )
|
|
self.connection.rollback() # if commit wasn't called, this should back out the save
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj == None
|
|
|
|
def test_save_and_load_with_explicit_commit( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.save( basic_obj, commit = False )
|
|
self.database.commit()
|
|
self.connection.rollback() # should have no effect because of the call to commit
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj.object_id == basic_obj.object_id
|
|
assert obj.revision.replace( tzinfo = utc ) == original_revision
|
|
assert obj.value == basic_obj.value
|
|
|
|
def test_select_one( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.save( basic_obj )
|
|
obj = self.database.select_one( Stub_object, Stub_object.sql_load( basic_obj.object_id ) )
|
|
|
|
assert obj.object_id == basic_obj.object_id
|
|
assert obj.revision.replace( tzinfo = utc ) == original_revision
|
|
assert obj.value == basic_obj.value
|
|
|
|
def test_select_one_tuple( self ):
|
|
obj = self.database.select_one( tuple, Stub_object.sql_tuple() )
|
|
|
|
assert len( obj ) == 2
|
|
assert obj[ 0 ] == 1
|
|
assert obj[ 1 ] == 2
|
|
|
|
def test_select_many( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
basic_obj2 = Stub_object( object_id = "6", value = 2 )
|
|
original_revision2 = basic_obj2.revision
|
|
|
|
self.database.save( basic_obj )
|
|
self.database.save( basic_obj2 )
|
|
objs = self.database.select_many( Stub_object, Stub_object.sql_load_em_all() )
|
|
|
|
assert len( objs ) == 2
|
|
assert objs[ 0 ].object_id == basic_obj.object_id
|
|
assert objs[ 0 ].revision.replace( tzinfo = utc ) == original_revision
|
|
assert objs[ 0 ].value == basic_obj.value
|
|
assert objs[ 1 ].object_id == basic_obj2.object_id
|
|
assert objs[ 1 ].revision.replace( tzinfo = utc ) == original_revision2
|
|
assert objs[ 1 ].value == basic_obj2.value
|
|
|
|
def test_select_many_tuples( self ):
|
|
objs = self.database.select_many( tuple, Stub_object.sql_tuple() )
|
|
|
|
assert len( objs ) == 1
|
|
assert len( objs[ 0 ] ) == 2
|
|
assert objs[ 0 ][ 0 ] == 1
|
|
assert objs[ 0 ][ 1 ] == 2
|
|
|
|
def test_select_many_with_no_matches( self ):
|
|
objs = self.database.select_many( Stub_object, Stub_object.sql_load_em_all() )
|
|
|
|
assert len( objs ) == 0
|
|
|
|
def test_save_and_load_revision( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.save( basic_obj )
|
|
basic_obj.value = 2
|
|
|
|
self.database.save( basic_obj )
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj.object_id == basic_obj.object_id
|
|
assert obj.revision.replace( tzinfo = utc ) == basic_obj.revision
|
|
assert obj.value == basic_obj.value
|
|
|
|
revised = self.database.load( Stub_object, basic_obj.object_id, revision = original_revision )
|
|
|
|
assert revised.object_id == basic_obj.object_id
|
|
assert revised.value == 1
|
|
assert revised.revision.replace( tzinfo = utc ) == original_revision
|
|
|
|
def test_execute( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.execute( basic_obj.sql_create() )
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj.object_id == basic_obj.object_id
|
|
assert obj.revision.replace( tzinfo = utc ) == original_revision
|
|
assert obj.value == basic_obj.value
|
|
|
|
def test_execute_without_commit( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.execute( basic_obj.sql_create(), commit = False )
|
|
self.connection.rollback()
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj == None
|
|
|
|
def test_execute_with_explicit_commit( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
original_revision = basic_obj.revision
|
|
|
|
self.database.execute( basic_obj.sql_create(), commit = False )
|
|
self.database.commit()
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj.object_id == basic_obj.object_id
|
|
assert obj.revision.replace( tzinfo = utc ) == original_revision
|
|
assert obj.value == basic_obj.value
|
|
|
|
def test_load_unknown( self ):
|
|
basic_obj = Stub_object( object_id = "5", value = 1 )
|
|
obj = self.database.load( Stub_object, basic_obj.object_id )
|
|
|
|
assert obj == None
|
|
|
|
def test_next_id( self ):
|
|
next_id = self.database.next_id( Stub_object )
|
|
assert next_id
|
|
assert self.database.load( Stub_object, next_id )
|
|
prev_ids = [ next_id ]
|
|
|
|
next_id = self.database.next_id( Stub_object )
|
|
assert next_id
|
|
assert next_id not in prev_ids
|
|
assert self.database.load( Stub_object, next_id )
|
|
prev_ids.append( next_id )
|
|
|
|
next_id = self.database.next_id( Stub_object )
|
|
assert next_id
|
|
assert next_id not in prev_ids
|
|
assert self.database.load( Stub_object, next_id )
|
|
|
|
def test_next_id_without_commit( self ):
|
|
next_id = self.database.next_id( Stub_object, commit = False )
|
|
self.connection.rollback()
|
|
assert self.database.load( Stub_object, next_id ) == None
|
|
|
|
def test_next_id_with_explit_commit( self ):
|
|
next_id = self.database.next_id( Stub_object, commit = False )
|
|
self.database.commit()
|
|
assert next_id
|
|
assert self.database.load( Stub_object, next_id )
|