evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment out index dropping for postgres--prevent hang.

Browse Source
This commit is contained in:
Ray 2009-03-16 18:23:45 -04:00
parent 66e734588c
commit bc2277af74
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
pyfpdb/fpdb_simple.py
View File

@ -156,12 +156,16 @@ def prepareBulkImport(fdb):
except: except:
pass pass
elif fdb.backend == PGSQL: elif fdb.backend == PGSQL:
print "dropping pg fk", fk['fktab'], fk['fkcol'] # DON'T FORGET TO RECREATE THEM!!
try: print "Index dropping disabled for postgresql."
fdb.cursor.execute("alter table " + fk['fktab'] + " drop constraint " # print "dropping pg fk", fk['fktab'], fk['fkcol']
+ fk['fktab'] + '_' + fk['fkcol'] + '_fkey') # try:
except: # fdb.cursor.execute("alter table " + fk['fktab'] + " drop constraint "
pass # + fk['fktab'] + '_' + fk['fkcol'] + '_fkey')
# print "alter table " + fk['fktab'] + " drop constraint " \
# + fk['fktab'] + '_' + fk['fkcol'] + '_fkey'
# except:
# pass
else: else:
print "Only MySQL and Postgres supported so far" print "Only MySQL and Postgres supported so far"
return -1 return -1
@ -175,12 +179,17 @@ def prepareBulkImport(fdb):
except: except:
pass pass
elif fdb.backend == PGSQL: elif fdb.backend == PGSQL:
print "dropping pg index ", idx['tab'], idx['col'] # DON'T FORGET TO RECREATE THEM!!
# mod to use tab_col for index name? print "Index dropping disabled for postgresql."
try: # print "dropping pg index ", idx['tab'], idx['col']
fdb.cursor.execute( "drop index %s_%s_idx" % (idx['tab'],idx['col']) ) # # mod to use tab_col for index name?
except: # try:
pass # pass
# print "drop index %s_%s_idx" % (idx['tab'],idx['col'])
# fdb.cursor.execute( "drop index %s_%s_idx" % (idx['tab'],idx['col']) )
# print "dropped pg index ", idx['tab'], idx['col']
# except:
# pass
else: else:
print "Only MySQL and Postgres supported so far" print "Only MySQL and Postgres supported so far"
return -1 return -1
@ -219,14 +228,19 @@ def afterBulkImport(fdb):
except: except:
pass pass
elif fdb.backend == PGSQL: elif fdb.backend == PGSQL:
print "creating fk ", fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] pass
try: # print "creating fk ", fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol']
fdb.cursor.execute("alter table " + fk['fktab'] + " add constraint " # try:
+ fk['fktab'] + '_' + fk['fkcol'] + '_fkey' # print "alter table " + fk['fktab'] + " add constraint " \
+ " foreign key (" + fk['fkcol'] # + fk['fktab'] + '_' + fk['fkcol'] + '_fkey' \
+ ") references " + fk['rtab'] + "(" + fk['rcol'] + ")") # + " foreign key (" + fk['fkcol'] \
except: # + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")"
pass # fdb.cursor.execute("alter table " + fk['fktab'] + " add constraint "
# + fk['fktab'] + '_' + fk['fkcol'] + '_fkey'
# + " foreign key (" + fk['fkcol']
# + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")")
# except:
# pass
else: else:
print "Only MySQL and Postgres supported so far" print "Only MySQL and Postgres supported so far"
return -1 return -1
@ -241,15 +255,16 @@ def afterBulkImport(fdb):
except: except:
pass pass
elif fdb.backend == PGSQL: elif fdb.backend == PGSQL:
# mod to use tab_col for index name? pass
print "creating pg index ", idx['tab'], idx['col'] # # mod to use tab_col for index name?
try: # print "creating pg index ", idx['tab'], idx['col']
print "create index %s_%s_idx on %s(%s)" % (idx['tab'], idx['col'], idx['tab'], idx['col']) # try:
fdb.cursor.execute( "create index %s_%s_idx on %s(%s)" # print "create index %s_%s_idx on %s(%s)" % (idx['tab'], idx['col'], idx['tab'], idx['col'])
% (idx['tab'], idx['col'], idx['tab'], idx['col']) ) # fdb.cursor.execute( "create index %s_%s_idx on %s(%s)"
except: # % (idx['tab'], idx['col'], idx['tab'], idx['col']) )
print " ERROR! :-(" # except:
pass # print " ERROR! :-("
# pass
else: else:
print "Only MySQL and Postgres supported so far" print "Only MySQL and Postgres supported so far"
return -1 return -1