Commit e52b28f

committed

default json key ordering -> crud, distinct

1 parent f38a5de commit e52b28fCopy full SHA for e52b28f

File tree

+16

-8

lines changed

.idea
- workspace.xml
output.json
out/production/SqlToJsonParser/com/inzapp/sqlToJsonParser/core/json
- JsonManager.class
src/com/inzapp/sqlToJsonParser/core/json
- JsonManager.java

+16

-8

lines changed

Lines changed: 1 addition & 4 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

114 Bytes

Binary file not shown.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"CRUD": ["SELECT"],`
`3`		`- "COLUMN": ["VAL"],`
`4`	`3`	`"DISTINCT": ["TRUE"],`
	`4`	`+ "COLUMN": ["VAL"],`
`5`	`5`	`"TABLE": ["((SELECT FIELD1 AS VAL FROM TABLE1 WHERE CONDITION1 = 'CONDITION1') UNION ALL (SELECT FIELD2 FROM TABLE1 WHERE CONDITION2 = 'CONDITION2') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3')) T"],`
`6`	`6`	`"TABLE ALIAS": ["T"],`
`7`	`7`	`"TABLE SUB QUERY 1": ["((SELECT FIELD1 AS VAL FROM TABLE1 WHERE CONDITION1 = 'CONDITION1') UNION ALL (SELECT FIELD2 FROM TABLE1 WHERE CONDITION2 = 'CONDITION2') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3'))"],`

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,22 @@ public class JsonManager {`
`22`	`22`	`*/`
`23`	`23`	`protected JsonManager() {`
`24`	`24`	`this.json = new JSONObject((Comparator<String>) (a, b) -> {`
`25`		`- if(a.equals(JsonKey.CRUD) && b.equals(JsonKey.CRUD))`
	`25`	`+ String jsonKey;`
	`26`	`+`
	`27`	`+ jsonKey = JsonKey.CRUD;`
	`28`	`+ if(a.equals(jsonKey) && b.equals(jsonKey))`
	`29`	`+ return 0;`
	`30`	`+ else if(a.equals(jsonKey))`
	`31`	`+ return -1;`
	`32`	`+ else if(b.equals(jsonKey))`
	`33`	`+ return 1;`
	`34`	`+`
	`35`	`+ jsonKey = JsonKey.DISTINCT;`
	`36`	`+ if(a.equals(jsonKey) && b.equals(jsonKey))`
`26`	`37`	`return 0;`
`27`		`- else if(a.equals(JsonKey.CRUD))`
	`38`	`+ else if(a.equals(jsonKey))`
`28`	`39`	`return -1;`
`29`		`- else if(b.equals(JsonKey.CRUD))`
	`40`	`+ else if(b.equals(jsonKey))`
`30`	`41`	`return 1;`
`31`	`42`
`32`	`43`	`return a.compareTo(b);`

Comments

(0)