hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Terminate pgsql database sessions before dropping users/databases.

Browse Source
This commit is contained in:
Michael Hierweck 2014-08-28 19:27:49 +02:00
parent 278954bb97
commit c031f5004c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
View File

@ -45,6 +45,7 @@ public class PgSqlDatabaseProcessorFactory implements EntityProcessorFactory {
assert db.getInstance().equals("pgsql"); assert db.getInstance().equals("pgsql");
JDBCProcessor aJDBCP = createPostgreSqlAdminProcessor(); JDBCProcessor aJDBCP = createPostgreSqlAdminProcessor();
String aName = AbstractEntity.escapeString(db.getName()); String aName = AbstractEntity.escapeString(db.getName());
aJDBCP.addSQL("SELECT pg_terminate_backend(procpid) FROM pg_stat_activity WHERE datname='" + aName + "'");
aJDBCP.addSQL("DROP DATABASE " + aName); aJDBCP.addSQL("DROP DATABASE " + aName);
return aJDBCP; return aJDBCP;
} }

1
hsarback/src/de/hsadmin/mods/db/PgSqlUserProcessorFactory.java
View File

@ -40,6 +40,7 @@ public class PgSqlUserProcessorFactory implements EntityProcessorFactory {
assert dbu.getInstance().equals("pgsql"); assert dbu.getInstance().equals("pgsql");
JDBCProcessor aJDBCP = PgSqlDatabaseProcessorFactory.createPostgreSqlAdminProcessor(); JDBCProcessor aJDBCP = PgSqlDatabaseProcessorFactory.createPostgreSqlAdminProcessor();
String aName = AbstractEntity.escapeString(dbu.getName()); String aName = AbstractEntity.escapeString(dbu.getName());
aJDBCP.addSQL("SELECT pg_terminate_backend(procpid) FROM pg_stat_activity WHERE usename='" + aName + "'");
aJDBCP.addSQL("DROP USER " + aName); aJDBCP.addSQL("DROP USER " + aName);
return aJDBCP; return aJDBCP;
} }