From 5294db8e62af14aba968ef59663b32a9a96ac2f6 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 10 Aug 2010 22:36:36 +0000 Subject: [PATCH] fixed yet another regression with respect to newlines (SPR-7449) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3560 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../jdbc/datasource/init/ResourceDatabasePopulator.java | 2 +- .../jdbc/datasource/init/DatabasePopulatorTests.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java index 327df634e2a..0404963d3e5 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java @@ -263,7 +263,7 @@ public class ResourceDatabasePopulator implements DatabasePopulator { continue; } else if (c == '\n' || c == '\t') { - continue; + c = ' '; } } sb.append(c); diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java index 1552f4945b2..90113f952f1 100644 --- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java @@ -71,7 +71,6 @@ public class DatabasePopulatorTests { assertTestDatabaseCreated(); } - @Ignore("Disabled until SPR-7449 is resolved") @Test public void scriptWithEolBetweenTokens() throws Exception { databasePopulator.addScript(resourceLoader.getResource("users-schema.sql"));