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

try perform instead of select

Browse Source
This commit is contained in:
Peter Hormanns 2016-04-08 13:00:05 +02:00
parent 203f24c279
commit bdecf9bbd1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,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(pid) FROM pg_stat_activity WHERE datname='" + aName + "'"); aJDBCP.addSQL("PERFORM pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='" + aName + "'");
aJDBCP.addSQL("DROP DATABASE " + aName); aJDBCP.addSQL("DROP DATABASE " + aName);
return aJDBCP; return aJDBCP;
} }

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

@ -41,7 +41,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(pid) FROM pg_stat_activity WHERE usename='" + aName + "'"); aJDBCP.addSQL("PERFORM pg_terminate_backend(pid) FROM pg_stat_activity WHERE usename='" + aName + "'");
aJDBCP.addSQL("DROP USER " + aName); aJDBCP.addSQL("DROP USER " + aName);
return aJDBCP; return aJDBCP;
} }