row_numberなどのorder by句は改行させない
trunk/DMLBreaker3.x/DMLBreaker.js (diff)| @@ -325,6 +325,7 @@ | ||
| 325 | 325 | |
| 326 | 326 | var formatSql = ""; |
| 327 | 327 | var withFlg = false; |
| 328 | + var fromFlg = false; | |
| 328 | 329 | |
| 329 | 330 | unionFlg = false; |
| 330 | 331 |
| @@ -392,6 +393,7 @@ | ||
| 392 | 393 | |
| 393 | 394 | formatSql += wkAdd.substring(0, wkAdd.length - 5) + "\n" + tab + wkAdd.slice(-5); |
| 394 | 395 | wkAdd = "\n\t" + tab; |
| 396 | + fromFlg = true; | |
| 395 | 397 | |
| 396 | 398 | if (configComma == 1) { |
| 397 | 399 | wkAdd += "__SPACE__"; |
| @@ -467,7 +469,7 @@ | ||
| 467 | 469 | parenthesis = parenthesis_bk + parenthesis; |
| 468 | 470 | tab = tab.replace("\t", ""); |
| 469 | 471 | |
| 470 | - } else if (wkAdd.match(/ group by | order by /i) != null) { | |
| 472 | + } else if (wkAdd.match(/ group by | order by /i) != null && fromFlg) { | |
| 471 | 473 | |
| 472 | 474 | formatSql += wkAdd.substring(0, wkAdd.length - 9) + "\n" + tab + wkAdd.slice(-9); |
| 473 | 475 | wkAdd = "\n\t" + tab; |
kimur058