20170701

[rapideact/rapideact.git] / com / rapide_act / RapideMetaLoader.java

diff --git a/com/rapide_act/RapideMetaLoader.java b/com/rapide_act/RapideMetaLoader.java
index 49e0c55..2daa4ab 100644 (file)
--- a/com/rapide_act/RapideMetaLoader.java
+++ b/com/rapide_act/RapideMetaLoader.java
@@ -100,6 +100,7 @@ public class RapideMetaLoader{
                                executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_SEQUENCE], cp, true, false);
                                executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_TABLE], cp, true, false);
                        }
+
                        subFolder = new File(folder + "/TABLES");
                        inFiles = subFolder.listFiles();
                        tb_count = 0;
@@ -114,6 +115,10 @@ public class RapideMetaLoader{
                        executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_PKEY], cp, false, false);
                        executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_UKEY], cp, false, false);
                        executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_INDEX], cp, false, false);
+                       executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_SYNONYM], cp, false, false);
+                       executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_SEQUENCE], cp, false, false);
+                       executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_FK], cp, false, false);
+
                        subFolder = new File(folder + "/VIEWS");
                        inFiles = subFolder.listFiles();
                        int view_count = 0;
@@ -136,9 +141,6 @@ public class RapideMetaLoader{
                                        CmnUtils.infoPrint(String.format("%1$-42s","[PROCEDURE] " + procName) + " \83\81\83^\83f\81[\83^\82ª\83\8d\81[\83h\82³\82ê\82Ü\82µ\82½\81B");
                                }
                        }
-                       executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_SYNONYM], cp, false, false);
-                       executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_SEQUENCE], cp, false, false);
-                       executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_FK], cp, false, false);
 
                        CmnUtils.infoPrint("\83\81\83^\83f\81[\83^\83\8d\81[\83h\82ð\8fI\97¹\82µ\82Ü\82µ\82½\81B");
 
@@ -185,21 +187,20 @@ public class RapideMetaLoader{
                        while((strLine=br.readLine()) != null){
                                if (_cp.dbType == _cp.DB_TYPE_SQLSERVER){
                                        if(!strLine.equals("GO")){
-                                               strMltLine += _cp.inColLineSeparator + strLine;
+                                               strMltLine += _cp.lineSeparator + strLine;
                                        }
                                } else {
-                                       strMltLine += _cp.inColLineSeparator + strLine;
+                                       if(!strMltLine.equals("")){
+                                               strMltLine += _cp.lineSeparator + strLine;
+                                       } else {
+                                               strMltLine += strLine;
+                                       }
                                }
                        }
-                       strMltLine += _cp.lineSeparator;
                        if(_isReplace){
                                if(!strMltLine.equals("")){
                                        try {
-                                               if (_cp.dbType == _cp.DB_TYPE_ORACLE){
-                                                       _stmt = _dao.prepareSql(strMltLine.replaceAll("\r",""));
-                                               } else {
-                                                       _stmt = _dao.prepareSql(strMltLine);
-                                               }
+                                               _stmt = _dao.prepareSql(strMltLine.replaceAll("\r",""));
                                                _stmt.executeUpdate();
                                                if(_stmt != null){
                                                        _stmt.close();
@@ -212,11 +213,11 @@ public class RapideMetaLoader{
                                        }
                                }
                        } else {
+                               strMltLine += _cp.lineSeparator;
                                sqlLine = CmnUtils.split(strMltLine, _cp.SQL_TERMINATOR[_cp.dbType]);
                                for(int l = 0;l<sqlLine.length;l++){
-                                       if(!sqlLine[l].equals("") && !sqlLine[l].equals(_cp.lineSeparator)){
+                                       if(!CmnUtils.isEmpty(sqlLine[l]) && !sqlLine[l].equals(_cp.lineSeparator)){
                                                try {
-                                                       CmnUtils.debugPrint("'" + sqlLine[l] + "'");
                                                        if (_cp.dbType == _cp.DB_TYPE_ORACLE){
                                                                _stmt = _dao.prepareSql(sqlLine[l].replaceAll("\r",""));
                                                        } else {