Browse Source

only use transactions for PGSQL

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
099feacc73
  1. 11
      pyweb/mumble/management/update_schema.py

11
pyweb/mumble/management/update_schema.py

@ -26,8 +26,6 @@ from mumble.management.server_detect import find_existing_instances
def update_schema( **kwargs ): def update_schema( **kwargs ):
cursor = connection.cursor()
scriptpath = join( scriptpath = join(
settings.MUMBLE_DJANGO_ROOT, "pyweb", "mumble", "conversionsql", { settings.MUMBLE_DJANGO_ROOT, "pyweb", "mumble", "conversionsql", {
'postgresql_psycopg2': 'pgsql', 'postgresql_psycopg2': 'pgsql',
@ -41,11 +39,14 @@ def update_schema( **kwargs ):
scripts.sort() scripts.sort()
for filename in scripts: for filename in scripts:
cursor = connection.cursor()
scriptfile = open( os.path.join( scriptpath, filename ), "r" ) scriptfile = open( os.path.join( scriptpath, filename ), "r" )
try: try:
stmt = scriptfile.read() stmt = scriptfile.read()
cursor.execute( stmt ) cursor.execute( stmt )
transaction.commit()
if "postgresql" in settings.DATABASE_ENGINE:
transaction.commit()
except IOError, err: except IOError, err:
print "Error reading file '%s':" % filename print "Error reading file '%s':" % filename
@ -54,9 +55,11 @@ def update_schema( **kwargs ):
except cursor.db.connection.Error, err: except cursor.db.connection.Error, err:
print "Error executing file '%s':" % filename print "Error executing file '%s':" % filename
print err print err
transaction.rollback()
if "postgresql" in settings.DATABASE_ENGINE:
transaction.rollback()
finally: finally:
scriptfile.close() scriptfile.close()
cursor.close()
find_existing_instances( **kwargs ) find_existing_instances( **kwargs )
Loading…
Cancel
Save