From 20670008d65308a1ddb8964c1a54ac4da68bf411 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 15 Mar 2010 14:32:23 +0000
Subject: [PATCH] bug fixed: couldn't create database with owner having a '-'
SVN: 15152
---
.../cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 3e2ad5ba2ce..d1fe0e06481 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
@@ -49,7 +49,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
private static final String SQL_FILE_TYPE = ".sql";
private static final String CREATE_DATABASE_SQL_TEMPLATE =
- "create database %1$s with owner = %2$s encoding = 'utf8' template = template0 tablespace = pg_default; "
+ "create database %1$s with owner = \"%2$s\" encoding = 'utf8' template = template0 tablespace = pg_default; "
+ "alter database %1$s set default_with_oids = off;";
private static final String CREATE_PLPGSQL = "create language plpgsql;";
@@ -262,7 +262,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
if (operationLog.isDebugEnabled())
{
operationLog.debug("Searching for mass upload files in directory '"
- + dumpFolder.getAbsolutePath() + "'.");
+ + dumpFolder.getAbsolutePath() + "'.");
}
String[] csvFiles = dumpFolder.list(new FilenameFilter()
{
--
GitLab