# HG changeset patch # User catherine.devlin@gmail.com # Date 1277871335 14400 # Node ID 7e72a5f6a94bf0498dba09633f17dd9de0917082 # Parent e60d9192bfaadeb30fd51dae118655ff6fe3b3ec check for any database adapters diff -r e60d9192bfaa -r 7e72a5f6a94b sqlpython/connections.py --- a/sqlpython/connections.py Wed May 19 15:13:44 2010 -0400 +++ b/sqlpython/connections.py Wed Jun 30 00:15:35 2010 -0400 @@ -8,21 +8,29 @@ import optparse import doctest +gerald_classes = {} + try: import cx_Oracle + gerald_classes['oracle'] = gerald.oracle_schema.User except ImportError: pass try: import psycopg2 + gerald_classes['postgres'] = gerald.PostgresSchema except ImportError: pass try: import MySQLdb + gerald_classes['mysql'] = gerald.MySQLSchema except ImportError: pass +if not gerald_classes: + raise ImportError, 'No Python database adapters installed!' + class ObjectDescriptor(object): def __init__(self, name, dbobj): self.fullname = name @@ -215,10 +223,6 @@ return cx_Oracle.connect(user = self.username, password = self.password, dsn = self.dsn, mode = self.mode) -gerald_classes = {'oracle': gerald.oracle_schema.User, - 'postgres': gerald.PostgresSchema, - 'mysql': gerald.MySQLSchema } - class DatabaseInstance(object): import_failure = None username = None