annotate sqlpython/connections.py @ 434:8e822859e3a4

tweaking ls hits
author catherine@dellzilla
date Wed, 27 Jan 2010 10:40:40 -0500
parents 439621c917c4
children 5443c5d5ed8c
rev   line source
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
1 import re
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
2 import os
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
3 import getpass
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
4 import gerald
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
5 import schemagroup
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
6 import time
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
7 import threading
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
8
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
9 class ObjectDescriptor(object):
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
10 def __init__(self, name, dbobj):
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
11 self.fullname = name
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
12 self.dbobj = dbobj
433
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
13 self.type = str(type(self.dbobj)).split('.')[-1].lower().strip("'>")
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
14 self.path = '%s/%s' % (self.type, self.fullname)
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
15 #self.type_path = '%s/' % self.dbobj.type
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
16 (self.owner, self.unqualified_name) = self.fullname.split('.')
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
17 self.owner = self.owner.lower()
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
18 def match_pattern(self, pattern, specific_owner=None):
433
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
19 return ( pattern.match(self.fullname) or
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
20 pattern.match(self.type) or
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
21 ((not specific_owner) and pattern.match(self.unqualified_name)) or
433
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
22 (specific_owner and (self.owner == specific_owner.lower()) and pattern.match(self.unqualified_name)) )
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
23
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
24 class GeraldPlaceholder(object):
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
25 current = False
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
26 complete = False
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
27
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
28 class DatabaseInstance(object):
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
29 password = None
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
30 uri = None
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
31 connection_uri_parser = re.compile('(postgres|oracle|mysql|sqlite|mssql):/(.*$)', re.IGNORECASE)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
32
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
33 def __init__(self, arg, opts, default_rdbms = 'oracle'):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
34 self.default_rdbms = default_rdbms
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
35 if not self.parse_connect_uri(arg):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
36 self.parse_connect_arg(arg, opts)
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
37 self.connection = self.new_connection()
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
38 self.gerald = GeraldPlaceholder()
433
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
39 self.discover_metadata()
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
40
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
41 def discover_metadata(self):
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
42 self.metadata_discovery_thread = MetadataDiscoveryThread(self)
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
43 self.metadata_discovery_thread.start()
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
44
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
45 def parse_connect_uri(self, uri):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
46 results = self.connection_uri_parser.search(uri)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
47 if results:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
48 (self.username, self.password, self.host, self.port, self.db_name
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
49 ) = gerald.utilities.dburi.Connection().parse_uri(results.group(2))
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
50 self.__class__ = rdbms_types.get(results.group(1))
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
51 self.uri = uri
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
52 self.port = self.port or self.default_port
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
53 return True
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
54 else:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
55 return False
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
56
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
57 def parse_connect_arg(self, arg, opts):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
58 self.host = opts.hostname
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
59 self.oracle_connect_mode = 0
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
60 if opts.postgres:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
61 self.__class__ = PostgresDatabaseInstance
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
62 elif opts.mysql:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
63 self.__class__ = MySQLDatabaseInstance
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
64 elif opts.oracle:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
65 self.__class__ = OracleDatabaseInstance
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
66 else:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
67 self.__class__ = rdbms_types.get(self.default_rdbms)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
68 self.assign_args(arg, opts)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
69 self.db_name = opts.database or self.db_name
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
70 self.port = self.port or self.default_port
430
aa1a603740fe making progress, but there is something awful about threaded calls to sysdate
catherine@dellzilla
parents: 428
diff changeset
71 self.password = self.password or opts.password or getpass.getpass('Password: ')
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
72 self.uri = self.uri or '%s://%s:%s@%s:%s/%s' % (self.rdbms, self.username, self.password,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
73 self.host, self.port, self.db_name)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
74
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
75 def gerald_uri(self):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
76 return self.uri.split('?mode=')[0]
433
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
77
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
78 def set_instance_number(self, instance_number):
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
79 self.instance_number = instance_number
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
80 self.prompt = "%d:%s@%s> " % (self.instance_number, self.username, self.db_name)
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
81
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
82 class OpenSourceDatabaseInstance(DatabaseInstance):
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
83 def assign_args(self, arg, opts):
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
84 self.assign_details(arg, opts)
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
85 self.username = self.username or os.environ['USER']
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
86 self.db_name = self.db_name or self.username
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
87 self.host = opts.hostname or self.host or 'localhost'
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
88
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
89 try:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
90 import psycopg2
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
91 class PostgresDatabaseInstance(OpenSourceDatabaseInstance):
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
92 gerald_class = gerald.PostgresSchema
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
93 rdbms = 'postgres'
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
94 default_port = 5432
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
95 def assign_details(self, arg, opts):
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
96 self.port = opts.port or os.getenv('PGPORT') or self.default_port
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
97 self.host = self.host or os.getenv('PGHOST')
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
98 args = arg.split()
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
99 if len(args) > 1:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
100 self.username = args[1]
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
101 if len(args) > 0:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
102 self.db_name = args[0]
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
103 def new_connection(self):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
104 return psycopg2.connect(host = self.host, user = self.username,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
105 password = self.password, database = self.db_name,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
106 port = self.port)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
107 except ImportError:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
108 class PostgresDatabaseInstance(OpenSourceDatabaseInstance):
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
109 pass
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
110
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
111 try:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
112 import MySQLdb
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
113 class MySQLDatabaseInstance(OpenSourceDatabaseInstance):
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
114 gerald_class = gerald.MySQLSchema
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
115 rdbms = 'mysql'
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
116 default_port = 3306
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
117 def assign_details(self, arg, opts):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
118 self.db_name = arg
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
119 def new_connection(self):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
120 return MySQLdb.connect(host = self.host, user = self.username,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
121 passwd = self.password, db = self.db_name,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
122 port = self.port, sql_mode = 'ANSI')
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
123 except ImportError:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
124 class MySQLDatabaseInstance(OpenSourceDatabaseInstance):
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
125 pass
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
126
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
127 try:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
128 import cx_Oracle
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
129
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
130 class OracleDatabaseInstance(DatabaseInstance):
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
131 gerald_class = gerald.oracle_schema.User
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
132 rdbms = 'oracle'
434
8e822859e3a4 tweaking ls hits
catherine@dellzilla
parents: 433
diff changeset
133 connection_parser = re.compile('(?P<username>[^/\s@]*)(/(?P<password>[^/\s@]*))?(@((?P<host>[^/\s:]*)(:(?P<port>\d{1,4}))?/)?(?P<db_name>[^/\s:]*))?(\s+as\s+(?P<mode>sys(dba|oper)))?',
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
134 re.IGNORECASE)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
135 connection_modes = {'SYSDBA': cx_Oracle.SYSDBA, 'SYSOPER': cx_Oracle.SYSOPER}
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
136 oracle_connect_mode = 0
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
137 default_port = 1521
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
138 def assign_args(self, arg, opts):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
139 connectargs = self.connection_parser.search(arg)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
140 self.username = connectargs.group('username')
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
141 self.password = connectargs.group('password')
434
8e822859e3a4 tweaking ls hits
catherine@dellzilla
parents: 433
diff changeset
142 self.db_name = connectargs.group('db_name') or os.getenv('ORACLE_SID')
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
143 self.port = connectargs.group('port') or self.default_port
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
144 self.host = connectargs.group('host')
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
145 if self.host:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
146 self.dsn = cx_Oracle.makedsn(self.host, self.port, self.db_name)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
147 else:
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
148 self.dsn = self.db_name
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
149 self.uri = '%s://%s:%s@%s' % (self.rdbms, self.username, self.password, self.db_name)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
150 if connectargs.group('mode'):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
151 self.oracle_connect_mode = self.connection_modes.get(connectargs.group('mode').upper())
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
152 def new_connection(self):
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
153 return cx_Oracle.connect(user = self.username,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
154 password = self.password,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
155 dsn = self.dsn,
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
156 mode = self.oracle_connect_mode)
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
157
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
158
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
159 except ImportError:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
160 class OracleDatabaseInstance(DatabaseInstance):
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
161 pass
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
162
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
163 class MetadataDiscoveryThread(threading.Thread):
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
164 def __init__(self, db_instance):
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
165 threading.Thread.__init__(self)
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
166 self.db_instance = db_instance
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
167 def run(self):
433
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
168 self.db_instance.gerald.current = False
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
169 newgerald = self.db_instance.gerald_class(self.db_instance.username, self.db_instance.gerald_uri())
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
170 newgerald.descriptions = {}
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
171 for (name, obj) in newgerald.schema.items():
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
172 newgerald.descriptions[name] = ObjectDescriptor(name, obj)
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
173 newgerald.current = True
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
174 newgerald.complete = True
439621c917c4 changes to match refactored cmd2
catherine@dellzilla
parents: 432
diff changeset
175 self.db_instance.gerald = newgerald
432
26b09e1481e7 beginning to reimplement threaded metadata discovery
catherine@dellzilla
parents: 431
diff changeset
176
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 427
diff changeset
177 rdbms_types = {'oracle': OracleDatabaseInstance, 'mysql': MySQLDatabaseInstance, 'postgres': PostgresDatabaseInstance}
427
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
178
8c1dec7fbd71 refactoring connections in progress
catherine@dellzilla
parents:
diff changeset
179