# openerp/service/web_services.py).
def drop_database(database_name):
import openerp
+ openerp.netsvc.init_logger()
db = openerp.sql_db.db_connect('template1')
cr = db.cursor()
cr.autocommit(True) # avoid transaction block
# TODO option for doing this.
# Try to terminate all other connections that might prevent
# dropping the database
+
+ # PostgreSQL 9.2 renamed pg_stat_activity.procpid to pid:
+ # http://www.postgresql.org/docs/9.2/static/release-9-2.html#AEN110389
+ pid_col = 'pid' if cr._cnx.server_version >= 90200 else 'procpid'
try:
- cr.execute("""SELECT pg_terminate_backend(procpid)
+ cr.execute("""SELECT pg_terminate_backend(%(pid_col)s)
FROM pg_stat_activity
- WHERE datname = %s AND
- procpid != pg_backend_pid()""",
+ WHERE datname = %%s AND
+ %(pid_col)s != pg_backend_pid()""" % {'pid_col': pid_col},
(database_name,))
except Exception:
pass
try:
- cr.execute('DROP DATABASE "%s"' % database_name)
+ cr.execute('DROP DATABASE "%s"' % database_name, log_exceptions=False)
except Exception, e:
print "Can't drop %s" % (database_name,)
finally: