github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7217] DDLDatabase should sort SQL files

Browse Source
This commit is contained in:
lukaseder 2018-02-23 11:29:21 +01:00
parent 1c1e27521a
commit 35069aadfc
3 changed files with 183 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java
View File

@ -47,6 +47,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@ -65,6 +66,7 @@ import org.jooq.tools.JooqLogger;
import org.jooq.tools.jdbc.JDBCUtils;
import org.jooq.util.SchemaDefinition;
import org.jooq.util.h2.H2Database;
import org.jooq.util.tools.FileComparator;
import org.h2.api.ErrorCode;
@ -164,8 +166,14 @@ public class DDLDatabase extends H2Database {
else if (file.isDirectory()) {
log.info("Reading from: " + file);
for (File f : file.listFiles())
load(encoding, f, pattern);
File[] files = file.listFiles();
if (files != null) {
Arrays.sort(files, FileComparator.INSTANCE);
for (File f : files)
load(encoding, f, pattern);
}
}
}

76
jOOQ-meta-extensions/src/main/java/org/jooq/util/tools/FileComparator.java Normal file
View File

@ -0,0 +1,76 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Other licenses:
* -----------------------------------------------------------------------------
* Commercial licenses for this work are available. These replace the above
* ASL 2.0 and offer limited warranties, support, maintenance, and commercial
* database integrations.
*
* For more information, please visit: http://www.jooq.org/licenses
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
package org.jooq.util.tools;
import java.io.File;
import java.util.Comparator;
/**
* A comparator that compares file names semantically, just like the Windows
* Explorer.
* <p>
* <strong>Desired semantic ordering:</strong>
*
* <pre>
* version-1
* version-2
* version-10
* </pre>
* <p>
* <strong>Undesired, lexicographic ordering:</strong>
*
* <pre>
* version-1
* version-10
* version-2
* </pre>
*
* @author Lukas Eder
*/
public final class FileComparator implements Comparator<File> {
public static final FileComparator INSTANCE = new FileComparator();
@Override
public final int compare(File o1, File o2) {
String s1 = o1 == null ? null : o1.getName();
String s2 = o2 == null ? null : o2.getName();
return FilenameComparator.INSTANCE.compare(s1, s2);
}
}

97
jOOQ-meta-extensions/src/main/java/org/jooq/util/tools/FilenameComparator.java Normal file
View File

@ -0,0 +1,97 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Other licenses:
* -----------------------------------------------------------------------------
* Commercial licenses for this work are available. These replace the above
* ASL 2.0 and offer limited warranties, support, maintenance, and commercial
* database integrations.
*
* For more information, please visit: http://www.jooq.org/licenses
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
package org.jooq.util.tools;
import java.math.BigInteger;
import java.util.Comparator;
import java.util.regex.Pattern;
/**
* A comparator that compares file names semantically, just like the Windows
* Explorer.
* <p>
* <strong>Desired semantic ordering:</strong>
*
* <pre>
* version-1
* version-2
* version-10
* </pre>
* <p>
* <strong>Undesired, lexicographic ordering:</strong>
*
* <pre>
* version-1
* version-10
* version-2
* </pre>
*
* @author Lukas Eder
*/
public final class FilenameComparator implements Comparator<String> {
// Idea taken from here: https://codereview.stackexchange.com/a/37217/5314
private static final Pattern NUMBERS = Pattern.compile("(?<=\\D)(?=\\d)|(?<=\\d)(?=\\D)");
public static final FilenameComparator INSTANCE = new FilenameComparator();
@Override
public final int compare(String o1, String o2) {
if (o1 == null || o2 == null)
return o1 == null ? o2 == null ? 0 : -1 : 1;
String[] split1 = NUMBERS.split(o1);
String[] split2 = NUMBERS.split(o2);
for (int i = 0; i < Math.min(split1.length, split2.length); i++) {
char c1 = split1[i].charAt(0);
char c2 = split2[i].charAt(0);
int cmp = 0;
if (c1 >= '0' && c1 <= '9' && c2 >= 0 && c2 <= '9')
cmp = new BigInteger(split1[i]).compareTo(new BigInteger(split2[i]));
if (cmp == 0)
cmp = split1[i].compareTo(split2[i]);
if (cmp != 0)
return cmp;
}
return 0;
}
}