設定「JOIN位置を追加、出力パネルの選択タブ」を追加
trunk/DMLBreaker3.x/DMLBreaker.js (diff)| @@ -426,6 +426,10 @@ | ||
| 426 | 426 | |
| 427 | 427 | } else if (wkAdd.match(/ where /i) != null) { |
| 428 | 428 | |
| 429 | + if (joinFlg) { | |
| 430 | + tab = tab.replace("\t", ""); | |
| 431 | + } | |
| 432 | + | |
| 429 | 433 | formatSql = formatWhere(formatSql); |
| 430 | 434 | |
| 431 | 435 | } else if (wkAdd.match(/ (inner|right|cross) join /i) != null) { |
| @@ -516,6 +520,10 @@ | ||
| 516 | 520 | |
| 517 | 521 | } else if (wkAdd.match(/ group by | order by /i) != null && fromFlg) { |
| 518 | 522 | |
| 523 | + if (joinFlg) { | |
| 524 | + tab = tab.replace("\t", ""); | |
| 525 | + } | |
| 526 | + | |
| 519 | 527 | formatSql += wkAdd.substring(0, wkAdd.length - 9) + "\n" + tab + wkAdd.slice(-9); |
| 520 | 528 | wkAdd = "\n\t" + tab; |
| 521 | 529 |
| @@ -525,6 +533,10 @@ | ||
| 525 | 533 | |
| 526 | 534 | } else if (wkAdd.match(/ having /i) != null) { |
| 527 | 535 | |
| 536 | + if (joinFlg) { | |
| 537 | + tab = tab.replace("\t", ""); | |
| 538 | + } | |
| 539 | + | |
| 528 | 540 | formatSql += wkAdd.substring(0, wkAdd.length - 7) + "\n" + tab + wkAdd.slice(-7); |
| 529 | 541 | wkAdd = "\n\t" + tab; |
| 530 | 542 |
| @@ -534,6 +546,10 @@ | ||
| 534 | 546 | |
| 535 | 547 | } else if (wkAdd.match(/ __UNION_ALL__ /) != null) { |
| 536 | 548 | |
| 549 | + if (joinFlg) { | |
| 550 | + tab = tab.replace("\t", ""); | |
| 551 | + } | |
| 552 | + | |
| 537 | 553 | formatSql += wkAdd.substring(0, wkAdd.length - 14) + "\n" + tab + wkAdd.slice(-14); |
| 538 | 554 | wkAdd = "\n" + tab; |
| 539 | 555 |
| @@ -542,6 +558,10 @@ | ||
| 542 | 558 | |
| 543 | 559 | } else if (wkAdd.match(/ union | minus | intersect /i) != null) { |
| 544 | 560 | |
| 561 | + if (joinFlg) { | |
| 562 | + tab = tab.replace("\t", ""); | |
| 563 | + } | |
| 564 | + | |
| 545 | 565 | var len = wkAdd.match(/ intersect /i) != null ? -10 : -6; |
| 546 | 566 | formatSql += wkAdd.substring(0, wkAdd.length + len) + "\n" + tab + wkAdd.slice(len); |
| 547 | 567 | wkAdd = "\n" + tab; |
kimur058