[Pybridge-commits] SF.net SVN: pybridge: [414] trunk/pybridge/pybridge/server/database.py

[<umg...@us...>]

Revision: 414
          http://svn.sourceforge.net/pybridge/?rev=414&view=rev
Author:   umgangee
Date:     2007-06-11 06:10:16 -0700 (Mon, 11 Jun 2007)

Log Message:
-----------
Add support for other database backends, to be specified in server config file. Requires testing with MySQL, PostgreSQL etc.

Modified Paths:
--------------
    trunk/pybridge/pybridge/server/database.py

Modified: trunk/pybridge/pybridge/server/database.py
===================================================================
--- trunk/pybridge/pybridge/server/database.py	2007-06-11 13:07:15 UTC (rev 413)
+++ trunk/pybridge/pybridge/server/database.py	2007-06-11 13:10:16 UTC (rev 414)
@@ -20,21 +20,55 @@
 from datetime import datetime
 from sqlobject import *
 from sqlobject.inheritance import InheritableSQLObject
+from twisted.python import log
 
 import pybridge.environment as env
+from pybridge.settings import Settings
 
 
-backend = "sqlite"
+# TODO: when fields are not empty, avoid writing default values to fields.
 
+configfile = env.find_config_server('server.cfg')
+settings = Settings(configfile, ['database'])
+
+
 # Initiate connection to the appropriate database backend.
-if backend == "sqlite":
-    db_filename = env.find_config_server("pybridge-server.db")
-    connection_string = "sqlite://" + db_filename # TODO: fix for Win32.
+# See http://sqlobject.org/SQLObject.html#declaring-the-class
 
-connection = connectionForURI(connection_string)
-sqlhub.processConnection = connection  # Set all classes to use connection.
+# This code has been tested with the SQLite database backend. If you experience
+# problems with databases supported by SQLObject, please file a bug report.
 
+backend = settings.database.get('backend', 'sqlite')  # Default to SQLite.
+settings.database['backend'] = backend
 
+if backend == 'sqlite':
+    dbfile = settings.database.get('dbfile')
+    if dbfile is None:
+        dbfile = env.find_config_server('pybridge-server.db')
+        settings.database['dbfile'] = dbfile
+    connection_string = "sqlite://" + dbfile
+else:
+    username = settings.database.get('username', '')
+    password = settings.database.get('password', '')
+    hostname = settings.database.get('hostname', 'localhost')
+    dbname = settings.database.get('dbname', 'pybridge')
+    connection_string = "%s://%s:%s/%s" % (username, password, hostname, dbname)
+
+settings.save()
+
+try:
+    connection = connectionForURI(connection_string)  # TODO: fix for Win32.
+    log.msg("Connection to %s database succeeded" % backend)
+except Exception, e:
+    log.err(e)
+    log.msg("Could not connect to %s database with URI: %s"
+            % (backend, connection_string))
+    log.msg("Please check configuration file %s" % configfile)
+    raise SystemExit  # Database connection is required for server operation.
+
+sqlhub.processConnection = connection  # Set all SQLObjects to use connection.
+
+
 class UserAccount(SQLObject):
     """A store of user information.
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.