Skip to content

Commit cbd941f

Browse files
zhixuanjiaJesse Jia
and
Jesse Jia
authored
Bug fix - Fix the issue for loading sql script. (#509)
* [fix] Fix the issue for loading sql script * remove new line --------- Co-authored-by: Jesse Jia <[email protected]>
1 parent 4796b51 commit cbd941f

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/FlywaySchemaEvolutionManager.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.linkedin.metadata.dao;
22

3-
import com.linkedin.util.FileUtil;
3+
import com.google.common.io.Resources;
44
import io.ebean.EbeanServer;
55
import io.ebean.SqlRow;
6-
import java.io.File;
76
import java.io.IOException;
87
import java.io.InputStream;
98
import java.nio.charset.StandardCharsets;
10-
import java.nio.file.Files;
119
import java.util.List;
1210
import java.util.Properties;
1311
import lombok.extern.slf4j.Slf4j;
@@ -69,10 +67,9 @@ public void ensureSchemaUpToDate() {
6967

7068
for (MigrationInfo pendingMigration : pendingMigrations) {
7169
try {
72-
List<File> file = FileUtil.listFiles(new File("."),
73-
pathname -> pathname.getName().equals(pendingMigration.getScript()));
70+
String location = _flyway.getConfiguration().getLocations()[0].getPath();
71+
String sql = Resources.toString(Resources.getResource(location + "/" + pendingMigration.getScript()), StandardCharsets.UTF_8);
7472

75-
String sql = new String(Files.readAllBytes(file.get(0).toPath()), StandardCharsets.UTF_8);
7673
List<String> highRiskSQL = detectPotentialHighRiskSQL(sql);
7774

7875
for (String statement : highRiskSQL) {

0 commit comments

Comments
 (0)