refactor: sql

soedirgo · soedirgo · commit 2b194fd5e2b3 · 2022-05-18T16:28:28.000+08:00
diff --git a/src/lib/PostgresMetaRoles.ts b/src/lib/PostgresMetaRoles.ts
@@ -26,12 +26,16 @@ SELECT
   *
 FROM
   roles
-${includeDefaultRoles ? '' : `WHERE name NOT IN (${DEFAULT_ROLES.map(literal).join(',')})`}`
+WHERE
+  true`
+    if (includeDefaultRoles) {
+      sql += ` AND name NOT IN (${DEFAULT_ROLES.map(literal).join(',')})`
+    }
     if (limit) {
-      sql = `${sql} LIMIT ${limit}`
+      sql += ` LIMIT ${limit}`
     }
     if (offset) {
-      sql = `${sql} OFFSET ${offset}`
+      sql += ` OFFSET ${offset}`
     }
     return await this.query(sql)
   }

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,16 @@ SELECT`
`26`	`26`	`*`
`27`	`27`	`FROM`
`28`	`28`	`roles`
`29`		-${includeDefaultRoles ? '' : `WHERE name NOT IN (${DEFAULT_ROLES.map(literal).join(',')})`}`
	`29`	`+WHERE`
	`30`	+ true`
	`31`	`+ if (includeDefaultRoles) {`
	`32`	+ sql += ` AND name NOT IN (${DEFAULT_ROLES.map(literal).join(',')})`
	`33`	`+ }`
`30`	`34`	`if (limit) {`
`31`		- sql = `${sql} LIMIT ${limit}`
	`35`	+ sql += ` LIMIT ${limit}`
`32`	`36`	`}`
`33`	`37`	`if (offset) {`
`34`		- sql = `${sql} OFFSET ${offset}`
	`38`	+ sql += ` OFFSET ${offset}`
`35`	`39`	`}`
`36`	`40`	`return await this.query(sql)`
`37`	`41`	`}`