From: kuboryu <kuboryu@yahoo.co.jp>
Date: Fri, 12 May 2017 23:34:50 +0000 (+0900)
Subject: 20170513_2
X-Git-Url: http://git.osdn.net/view?p=rapideact%2Frapideact.git;a=commitdiff_plain;h=9ff9eeede71f0e9e3b0f08c8bae917ae0da40cf1

20170513_2
---

diff --git a/com/rapide_act/RapideMetaLoader.java b/com/rapide_act/RapideMetaLoader.java
index 81e0fb4..588690f 100644
--- a/com/rapide_act/RapideMetaLoader.java
+++ b/com/rapide_act/RapideMetaLoader.java
@@ -93,12 +93,12 @@ public class RapideMetaLoader{
 			conn = dao.connect();
 
 			if(cp.isDrop){
-				executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_TABLE], cp, true, false);
+				executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_FK], cp, true, false);
 				executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_VIEW], cp, true, false);
 				executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_PROCEDURE], cp, true, false);
 				executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_SYNONYM], cp, true, false);
 				executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_SEQUENCE], cp, true, false);
-				executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.DROP_FK], 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();
@@ -108,6 +108,7 @@ public class RapideMetaLoader{
 					flName = CmnUtils.splitDot(inFiles[k].getName());
 					tbName = flName[0];
 					executeSqlFile(dao, stmt, subFolder + "/" + inFiles[k].getName(), cp, false, false);
+					CmnUtils.infoPrint(String.format("%1$-30s",tbName) + " ƒƒ^ƒf[ƒ^‚ªƒ[ƒh‚³‚ê‚Ü‚µ‚½B");
 				}
 			}
 			executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_PKEY], cp, false, false);
@@ -121,6 +122,7 @@ public class RapideMetaLoader{
 					flName = CmnUtils.splitDot(inFiles[k].getName());
 					viewName = flName[0];
 					executeSqlFile(dao, stmt, subFolder + "/" + inFiles[k].getName(), cp, false, false);
+					CmnUtils.infoPrint(String.format("%1$-30s",viewName) + " ƒƒ^ƒf[ƒ^‚ªƒ[ƒh‚³‚ê‚Ü‚µ‚½B");
 				}
 			}
 			subFolder = new File(folder + "/PROCEDURES");
@@ -131,6 +133,7 @@ public class RapideMetaLoader{
 					flName = CmnUtils.splitDot(inFiles[k].getName());
 					procName = flName[0];
 					executeSqlFile(dao, stmt, subFolder + "/" + inFiles[k].getName(), cp, false, true);
+					CmnUtils.infoPrint(String.format("%1$-30s",procName) + " ƒƒ^ƒf[ƒ^‚ªƒ[ƒh‚³‚ê‚Ü‚µ‚½B");
 				}
 			}
 			executeSqlFile(dao, stmt, folder + "/" + cp.SQL_FILE_NAME[cp.CREATE_SYNONYM], cp, false, false);
diff --git a/com/rapide_act/RapideMetaUnloader.java b/com/rapide_act/RapideMetaUnloader.java
index 275fcbf..634324f 100644
--- a/com/rapide_act/RapideMetaUnloader.java
+++ b/com/rapide_act/RapideMetaUnloader.java
@@ -611,6 +611,7 @@ public class RapideMetaUnloader{
 							for(int i=0;i<strSplit[2].length;i++)if(!strSplit[2][i].trim().equals(""))pw[0].println(strSplit[2][i]);
 							pw[0].close();
 							pw[0] = null;
+							CmnUtils.infoPrint(String.format("%1$-30s",tableName) + " ƒƒ^ƒf[ƒ^‚ªƒAƒ“ƒ[ƒh‚³‚ê‚Ü‚µ‚½B");
 							sbTbCnts = new StringBuffer();
 							sbTbCmnt = new StringBuffer();
 							sbTbCnts.append("CREATE TABLE " + DB_SQL_QUOTED_S[cp.dbType]+ strSplit[0][0] + DB_SQL_QUOTED_E[cp.dbType]);
@@ -682,6 +683,7 @@ public class RapideMetaUnloader{
 				for(int i=0;i<strSplit[2].length;i++)if(!strSplit[2][i].trim().equals(""))pw[0].println(strSplit[2][i]);
 				pw[0].close();
 				pw[0] = null;
+				CmnUtils.infoPrint(String.format("%1$-30s",tableName) + " ƒƒ^ƒf[ƒ^‚ªƒAƒ“ƒ[ƒh‚³‚ê‚Ü‚µ‚½B");
 			}
 			for(int i=1;i<4;i++)pw[i].close();
 			for(int i=1;i<4;i++)pw[i]=null;
@@ -899,6 +901,7 @@ public class RapideMetaUnloader{
 				}
 				pw[0].close();
 				pw[0] = null;
+				CmnUtils.infoPrint(String.format("%1$-30s",strSplit[0][0]) + " ƒƒ^ƒf[ƒ^‚ªƒAƒ“ƒ[ƒh‚³‚ê‚Ü‚µ‚½B");
 			}
 			for(int i=1;i<3;i++)pw[i].close();
 			for(int i=1;i<3;i++)pw[i]=null;
@@ -939,6 +942,7 @@ public class RapideMetaUnloader{
 				}
 				pw[0].close();
 				pw[0] = null;
+				CmnUtils.infoPrint(String.format("%1$-30s",strSplit[0][0]) + " ƒƒ^ƒf[ƒ^‚ªƒAƒ“ƒ[ƒh‚³‚ê‚Ü‚µ‚½B");
 			}
 			for(int i=1;i<3;i++)pw[i].close();
 			for(int i=1;i<3;i++)pw[i]=null;