• R/O
  • SSH
  • HTTPS

dbviewer: コミット


コミットメタ情報

リビジョン264 (tree)
日時2013-03-09 15:55:33
作者zigen

ログメッセージ

(メッセージはありません)

変更サマリ

差分

--- DBViewer/branches/2.0.0/src/zigen/plugin/db/core/rule/AbstractTableInfoSearchFactory.java (revision 263)
+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/core/rule/AbstractTableInfoSearchFactory.java (revision 264)
@@ -113,12 +113,13 @@
113113 }
114114
115115 public List getTableInfoAll(Connection con, String owner, String[] types, Character encloseChar) throws Exception {
116- List result = null;
116+ String query = null;
117+ List result = null;
117118 ResultSet rs = null;
118119 Statement st = null;
119120 try {
120121 st = con.createStatement();
121- String query = getTableInfoAllSql(owner, types);
122+ query = getTableInfoAllSql(owner, types);
122123 if (query != null) {
123124 result = new ArrayList();
124125 rs = st.executeQuery(query);
@@ -131,7 +132,7 @@
131132 }
132133 }
133134 } catch (Exception e) {
134- DbPlugin.log(e);
135+ DbPlugin.log(e.getMessage() + ", " + query, e);
135136 throw e;
136137 } finally {
137138 ResultSetUtil.close(rs);
--- DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForSchemaAction.java (revision 263)
+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForSchemaAction.java (revision 264)
@@ -53,9 +53,8 @@
5353 }
5454
5555 if (index == 2) {
56-
57- String msg = "DDLを比較します";
58- String opt = "コメントを無視する";
56+ String msg = "difference DDL"; //"DDLを比較します";
57+ String opt = "ignore comments"; // "コメントを無視する";
5958 MessageDialogWithToggle dialog = DbPlugin.getDefault().confirmDialogWithToggle(msg, opt, false);
6059 final int YES = 2;
6160 if (dialog.getReturnCode() == YES) {
--- DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForFolderAction.java (revision 263)
+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForFolderAction.java (revision 264)
@@ -53,10 +53,8 @@
5353 }
5454
5555 if (index == 2) {
56-
57-
58- String msg = "DDLを比較します";
59- String opt = "コメントを無視する";
56+ String msg = "difference DDL"; //"DDLを比較します";
57+ String opt = "ignore comments"; // "コメントを無視する";
6058 MessageDialogWithToggle dialog = DbPlugin.getDefault().confirmDialogWithToggle(msg, opt, false);
6159 final int YES = 2;
6260 if (dialog.getReturnCode() == YES) {
--- DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForTableAction.java (revision 263)
+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/diff/DDLDiffForTableAction.java (revision 264)
@@ -58,8 +58,8 @@
5858 }
5959
6060 if (index == 2) {
61- String msg = "DDLを比較します";
62- String opt = "コメントを無視する";
61+ String msg = "difference DDL"; //"DDLを比較します";
62+ String opt = "ignore comments"; // "コメントを無視する";
6363 MessageDialogWithToggle dialog = DbPlugin.getDefault().confirmDialogWithToggle(msg, opt, false);
6464 final int YES = 2;
6565 if (dialog.getReturnCode() == YES) {
--- DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/jobs/AbstractLoadColumnJob.java (revision 263)
+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/jobs/AbstractLoadColumnJob.java (revision 264)
@@ -46,27 +46,33 @@
4646
4747 if(table.getUpdTime() != null){
4848 ITable obj = DbPlugin.getDefault().getITableSerializeManager().load(table);
49- if(obj != null){
49+ if(obj != null){
50+
51+
5052 if(table instanceof Table && obj instanceof Table){
5153 // 本当は、更新日付が一致しているか確認が必要
52- Table cache = (Table)obj;
54+ //Table cache = (Table)obj;
5355
54- if(cache.getUpdTime() != null && table.getUpdTime() != null && cache.getUpdTime().equals(table.getUpdTime())){
56+ if(obj.getUpdTime() != null && table.getUpdTime() != null && obj.getUpdTime().equals(table.getUpdTime())){
5557
5658 if(!table.isExpanded()){
57- table.setTablePKColumns(cache.getTablePKColumns());
58- table.setTableFKColumns(cache.getTableFKColumns());
59- table.setTableConstraintColumns(cache.getTableConstraintColumns());
60- table.setTableUIDXColumns(cache.getTableUIDXColumns());
61- table.setTableNonUIDXColumns(cache.getTableNonUIDXColumns());
59+ table.setTablePKColumns(obj.getTablePKColumns());
60+ table.setTableFKColumns(obj.getTableFKColumns());
61+ table.setTableConstraintColumns(obj.getTableConstraintColumns());
62+ table.setTableUIDXColumns(obj.getTableUIDXColumns());
63+ table.setTableNonUIDXColumns(obj.getTableNonUIDXColumns());
6264 table.removeChild(table.getChild(DbPluginConstant.TREE_LEAF_LOADING));
6365
64- List chiren = cache.getChildren();
65- for (Iterator iterator = chiren.iterator(); iterator.hasNext();) {
66- Column col = (Column) iterator.next();
67- table.addChild(col);
68- }
69- System.out.println("キャッシュを利用しました " + table.getSqlTableName());
66+ if(obj instanceof Table){
67+ Table cache = (Table)obj;
68+ List chiren = cache.getChildren();
69+ for (Iterator iterator = chiren.iterator(); iterator.hasNext();) {
70+ Column col = (Column) iterator.next();
71+ table.addChild(col);
72+ }
73+ System.out.println("used cash. " + table.getSqlTableName());
74+ }
75+
7076 }
7177
7278 return true;
--- DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/views/BindingParamArea.java (revision 263)
+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/ui/views/BindingParamArea.java (revision 264)
@@ -199,7 +199,7 @@
199199
200200
201201
202- private static final String[] headers = {"", "変数名", "値", "文字型", "備考"};
202+ private static final String[] headers = {"", "paramName", "value", "type", "comments"};
203203
204204 private void setHeaderColumn(Table table, String[] headers) {
205205 for (int i = 0; i < headers.length; i++) {
--- DBViewer/branches/2.0.0/src/zigen/plugin/db/ITableSerializeManager.java (revision 263)
+++ DBViewer/branches/2.0.0/src/zigen/plugin/db/ITableSerializeManager.java (revision 264)
@@ -54,11 +54,11 @@
5454 String filePath = path.append(getKey(target)).toOSString();
5555 File f = new File(filePath);
5656 if(f.exists()){
57- System.out.println(target.getSqlTableName() + "のキャッシュを削除しました。" + f.delete());
57+ System.out.println(target.getSqlTableName() + "'s cash deleted." + f.delete());
5858 }
5959
6060 if(f.getParentFile().exists() && f.getParentFile().list().length == 0){
61- System.out.println(f.getParentFile().getName() + "フォルダを削除しました。" + f.getParentFile().delete());
61+ System.out.println(f.getParentFile().getName() + "'s folder deleted." + f.getParentFile().delete());
6262 }
6363
6464 }
旧リポジトリブラウザで表示