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. ................
168 lines
6.1 KiB
Python
Executable File
168 lines
6.1 KiB
Python
Executable File
#!/usr/bin/python2.5
|
|
|
|
import os
|
|
import os.path
|
|
import psycopg2 as psycopg
|
|
from pytz import timezone, utc
|
|
from datetime import datetime
|
|
from controller.Old_database import Old_database
|
|
from controller.Scheduler import Scheduler
|
|
|
|
|
|
pacific = timezone( "US/Pacific" )
|
|
|
|
|
|
def quote( value ):
|
|
if value is None:
|
|
return "null"
|
|
|
|
# if this is a datetime, assume it's in the Pacific timezone, and then convert it to UTC
|
|
if isinstance( value, datetime ):
|
|
value = value.replace( tzinfo = pacific ).astimezone( utc )
|
|
|
|
value = unicode( value )
|
|
|
|
return "'%s'" % value.replace( "'", "''" ).replace( "\\", "\\\\" )
|
|
|
|
|
|
class Converter( object ):
|
|
"""
|
|
Converts a Luminotes database from bsddb to PostgreSQL, using the old bsddb controller.Old_database.
|
|
This assumes that the PostgreSQL schema from model/schema.sql is already in the database.
|
|
"""
|
|
def __init__( self, scheduler, database ):
|
|
self.scheduler = scheduler
|
|
self.database = database
|
|
|
|
self.conn = psycopg.connect( "dbname=luminotes user=luminotes password=dev" )
|
|
self.cursor = self.conn.cursor()
|
|
|
|
thread = self.convert_database()
|
|
self.scheduler.add( thread )
|
|
self.scheduler.wait_for( thread )
|
|
|
|
def convert_database( self ):
|
|
inserts = set()
|
|
notes = {} # map of note object id to its notebook
|
|
startup_notes = {} # map of startup note object id to its notebook
|
|
|
|
for key in self.database._Old_database__db.keys():
|
|
if not self.database._Old_database__db.get( key ):
|
|
continue
|
|
|
|
self.database.load( key, self.scheduler.thread )
|
|
value = ( yield Scheduler.SLEEP )
|
|
|
|
class_name = value.__class__.__name__
|
|
|
|
if class_name == "Notebook":
|
|
if ( value.object_id, value.revision ) in inserts: continue
|
|
inserts.add( ( value.object_id, value.revision ) )
|
|
|
|
self.cursor.execute(
|
|
"insert into notebook " +
|
|
"( id, revision, name, trash_id ) " +
|
|
"values ( %s, %s, %s, %s );" %
|
|
( quote( value.object_id ), quote( value.revision ), quote( value.name ), value.trash and quote( value.trash.object_id ) or "null" )
|
|
)
|
|
|
|
for note in value.notes:
|
|
notes[ note.object_id ] = value
|
|
for startup_note in value.startup_notes:
|
|
startup_notes[ startup_note.object_id ] = value
|
|
elif class_name == "Note":
|
|
if ( value.object_id, value.revision ) in inserts: continue
|
|
inserts.add( ( value.object_id, value.revision ) )
|
|
|
|
# notebook_id, startup, and rank are all set below since they're pulled out of Notebook objects
|
|
self.cursor.execute(
|
|
"insert into note " +
|
|
"( id, revision, title, contents, notebook_id, startup, deleted_from_id, rank ) " +
|
|
"values ( %s, %s, %s, %s, %s, %s, %s, %s );" %
|
|
( quote( value.object_id ), quote( value.revision ), quote( value.title or None ), quote( value.contents or None ), quote( None ), quote( "f" ), quote( value.deleted_from or None ), quote( None ) )
|
|
)
|
|
elif class_name == "User":
|
|
if value.username is None: continue # note: this will skip all demo users
|
|
|
|
if ( value.object_id, value.revision ) in inserts: continue
|
|
inserts.add( ( value.object_id, value.revision ) )
|
|
|
|
self.cursor.execute(
|
|
"insert into luminotes_user " +
|
|
"( id, revision, username, salt, password_hash, email_address, storage_bytes, rate_plan ) " +
|
|
"values ( %s, %s, %s, %s, %s, %s, %s, %s );" %
|
|
( quote( value.object_id ), quote( value.revision ), quote( value.username ), quote( value._User__salt ), quote( value._User__password_hash ), quote( value.email_address ), value.storage_bytes, value.rate_plan )
|
|
)
|
|
for notebook in value.notebooks:
|
|
if notebook is None: continue
|
|
|
|
read_only = ( notebook.__class__.__name__ == "Read_only_notebook" )
|
|
if read_only:
|
|
notebook_id = notebook._Read_only_notebook__wrapped.object_id
|
|
else:
|
|
notebook_id = notebook.object_id
|
|
|
|
if ( value.object_id, notebook_id ) in inserts: continue
|
|
inserts.add( ( value.object_id, notebook_id ) )
|
|
|
|
self.cursor.execute(
|
|
"insert into user_notebook " +
|
|
"( user_id, notebook_id, read_write ) " +
|
|
"values ( %s, %s, %s );" %
|
|
( quote( value.object_id ), quote( notebook_id ),
|
|
quote( read_only and "f" or "t" ) )
|
|
)
|
|
if notebook.trash:
|
|
self.cursor.execute(
|
|
"insert into user_notebook " +
|
|
"( user_id, notebook_id, read_write ) " +
|
|
"values ( %s, %s, %s );" %
|
|
( quote( value.object_id ), quote( notebook.trash.object_id ),
|
|
quote( read_only and "f" or "t" ) )
|
|
)
|
|
elif class_name == "Read_only_notebook":
|
|
pass
|
|
elif class_name == "Password_reset":
|
|
if value.redeemed == True: continue
|
|
|
|
if ( value.object_id, value.revision ) in inserts: continue
|
|
inserts.add( ( value.object_id, value.revision ) )
|
|
|
|
self.cursor.execute(
|
|
"insert into password_reset " +
|
|
"( id, email_address, redeemed ) " +
|
|
"values ( %s, %s, %s );" %
|
|
( quote( value.object_id ), quote( value.email_address ), quote( value.redeemed and "t" or "f" ) )
|
|
)
|
|
elif class_name == "User_list":
|
|
pass
|
|
else:
|
|
raise Exception( "Unconverted value of type %s" % class_name )
|
|
|
|
for ( note_id, notebook ) in notes.items():
|
|
self.cursor.execute(
|
|
"update note set notebook_id = %s where id = %s" % ( quote( notebook.object_id ), quote( note_id ) )
|
|
)
|
|
|
|
for ( startup_note_id, notebook ) in startup_notes.items():
|
|
startup_ids = [ note.object_id for note in notebook.startup_notes ]
|
|
rank = startup_ids.index( startup_note_id )
|
|
|
|
self.cursor.execute(
|
|
"update note set startup = 't', rank = %s where id = %s" % ( rank, quote( startup_note_id ) )
|
|
)
|
|
|
|
self.conn.commit()
|
|
yield None
|
|
|
|
|
|
def main():
|
|
scheduler = Scheduler()
|
|
database = Old_database( scheduler, "data.db" )
|
|
initializer = Converter( scheduler, database )
|
|
scheduler.wait_until_idle()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|