Skip to content

Commit 24d0a40

Browse files
author
arno82
committed
Modify all line endings to CR+LF
All line endings are CR+LF now. If the line endings are mixed between LF and CR/LR within one file, they cause problems for checking into SVN: Inconsistent line ending style. Use formatDDL for special DDL types like DBMS JOB, Public DB Link and REFRESH Groups.
1 parent 39c97f9 commit 24d0a40

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main/java/com/googlecode/scheme2ddl/DDLFormatter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ public String formatDDL(String ddl) {
2020
return ddl;
2121

2222
ddl = ddl.trim() + "\n";
23+
24+
// replace unix line endings with windows
25+
ddl = ddl.replaceAll("\r\n", "\n");
26+
ddl = ddl.replaceAll("\n", "\r\n");
2327

2428
if (!isMorePrettyFormat)
2529
return ddl;

src/main/java/com/googlecode/scheme2ddl/UserObjectProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ private boolean matchesByPattern(String s, String pattern) {
6767
private String map2Ddl(UserObject userObject) throws CannotGetDDLException, NonSkippableException {
6868
try {
6969
if (userObject.getType().equals("DBMS JOB")) {
70-
return userObjectDao.findDbmsJobDDL(userObject.getName());
70+
return ddlFormatter.formatDDL(userObjectDao.findDbmsJobDDL(userObject.getName()));
7171
}
7272
if (userObject.getType().equals("PUBLIC DATABASE LINK")) {
73-
return userObjectDao.findDDLInPublicScheme(map2TypeForDBMS(userObject.getType()), userObject.getName());
73+
return ddlFormatter.formatDDL(userObjectDao.findDDLInPublicScheme(map2TypeForDBMS(userObject.getType()), userObject.getName()));
7474
}
7575
if (userObject.getType().equals("REFRESH_GROUP")) {
76-
return userObjectDao.findRefGroupDDL(userObject.getType(), userObject.getName());
76+
return ddlFormatter.formatDDL(userObjectDao.findRefGroupDDL(userObject.getType(), userObject.getName()));
7777
}
7878
String res = userObjectDao.findPrimaryDDL(map2TypeForDBMS(userObject.getType()), userObject.getName());
7979
if (userObject.getType().equals("SEQUENCE") && replaceSequenceValues) {

0 commit comments

Comments
 (0)