From c6df1eb2e2b7e4faa85f8c08e6bbc90e7c0be4b1 Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Wed, 15 Aug 2007 11:22:56 +0000 Subject: [PATCH] drop code creating language because it is not necessary SVN: 1378 --- .../postgresql/PostgreSQLAdminDAO.java | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java index 6ddc989d647..d7d94fbc561 100644 --- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java +++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java @@ -87,27 +87,11 @@ public class PostgreSQLAdminDAO extends SimpleJdbcDaoSupport implements IDatabas public void createDatabase() { - operationLog.info("Try to create empty database '" + database + "' with owner '" + owner + "'."); JdbcTemplate jdbcTemplate = getJdbcTemplate(); + operationLog.info("Try to create empty database '" + database + "' with owner '" + owner + "'."); jdbcTemplate.execute("create database " + database + " with owner = " + owner - + " encoding = 'utf8' tablespace = pg_default;" - + "alter database " + database + " set default_with_oids = off;"); - try - { - operationLog.info("Try to create language 'plpgsql'."); - jdbcTemplate.execute("create trusted procedural language 'plpgsql' handler plpgsql_call_handler " - + "validator plpgsql_validator;"); - } catch (DataAccessException e) - { - if (DBUtilities.isDuplicateObjectException(e)) - { - operationLog.info("Language 'plpgsql' already exists."); - } else - { - operationLog.error("Database language 'plpgsql' couldn't be created:", e); - throw e; - } - } + + " encoding = 'utf8' tablespace = pg_default;" + + "alter database " + database + " set default_with_oids = off;"); } public void dropDatabase() -- GitLab