@things-factory/shell 4.0.0-alpha.9 → 4.0.0-beta.0

package/server/utils/condition-builder.ts

@@ -15,68 +15,66 @@ export const buildCondition = function (
   switch (operator) {
     case 'eq':
       return {
-        clause: `"${alias}"."${fieldName}" = :args${seq}`,
+        clause: `${alias}.${fieldName} = :args${seq}`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'like':
       return {
-        clause: `"${alias}"."${fieldName}" LIKE :args${seq}`,
+        clause: `${alias}.${fieldName} LIKE :args${seq}`,
         parameters: { [`args${seq}`]: `${value}` }
       }
 
     case 'i_like':
       return {
-        clause: `LOWER("${alias}"."${fieldName}") LIKE :args${seq}`,
+        clause: `LOWER(${alias}.${fieldName}) LIKE :args${seq}`,
         parameters: { [`args${seq}`]: `${String(value).toLowerCase()}` }
       }
 
     case 'nlike':
       return {
-        clause: `"${alias}"."${fieldName}" NOT LIKE :args${seq}`,
+        clause: `${alias}.${fieldName} NOT LIKE :args${seq}`,
         value: { [`args${seq}`]: `${value}` }
       }
 
     case 'i_nlike':
       return {
-        clause: `LOWER("${alias}"."${fieldName}") NOT LIKE :args${seq}`,
+        clause: `LOWER(${alias}.${fieldName}) NOT LIKE :args${seq}`,
         value: { [`args${seq}`]: `${String(value).toLowerCase()}` }
       }
 
     case 'lt':
       return {
-        clause: `"${alias}"."${fieldName}" < :args${seq}`,
+        clause: `${alias}.${fieldName} < :args${seq}`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'gt':
       return {
-        clause: `"${alias}"."${fieldName}" > :args${seq}`,
+        clause: `${alias}.${fieldName} > :args${seq}`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'lte':
       return {
-        clause: `"${alias}"."${fieldName}" <= :args${seq}`,
+        clause: `${alias}.${fieldName} <= :args${seq}`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'gte':
       return {
-        clause: `"${alias}"."${fieldName}" >= :args${seq}`,
+        clause: `${alias}.${fieldName} >= :args${seq}`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'noteq':
       return {
-        clause: `"${alias}"."${fieldName}" != :args${seq}`,
+        clause: `${alias}.${fieldName} != :args${seq}`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'in':
-      const clause = relation
-        ? `"${fieldName}"."id" IN (:...args${seq})`
-        : `"${alias}"."${fieldName}" IN (:...args${seq})`
+      const clause = relation ? `${fieldName}.id IN (:...args${seq})` : `${alias}.${fieldName} IN (:...args${seq})`
       value = value?.length ? value : [value]
       return {
         clause,
@@ -85,57 +83,57 @@ export const buildCondition = function (
     case 'notin':
       value = value?.length ? value : [value]
       return {
-        clause: `"${alias}"."${fieldName}" NOT IN (:...args${seq})`,
+        clause: `${alias}.${fieldName} NOT IN (:...args${seq})`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'notin_with_null':
       value = value?.length ? value : [value]
       return {
-        clause: `("${alias}"."${fieldName}" IS NULL OR "${alias}"."${fieldName}" NOT IN (:...args${seq}))`,
+        clause: `(${alias}.${fieldName} IS NULL OR ${alias}.${fieldName} NOT IN (:...args${seq}))`,
         parameters: { [`args${seq}`]: value }
       }
 
     case 'is_null':
       return {
-        clause: `"${alias}"."${fieldName}" IS NULL`
+        clause: `${alias}.${fieldName} IS NULL`
       }
     case 'is_not_null':
       return {
-        clause: `"${alias}"."${fieldName}" IS NOT NULL`
+        clause: `${alias}.${fieldName} IS NOT NULL`
       }
     case 'is_false':
       return {
-        clause: `"${alias}"."${fieldName}" IS FALSE`
+        clause: `${alias}.${fieldName} IS FALSE`
       }
     case 'is_true':
       return {
-        clause: `"${alias}"."${fieldName}" IS TRUE`
+        clause: `${alias}.${fieldName} IS TRUE`
       }
     case 'is_not_false':
       return {
-        clause: `"${alias}"."${fieldName}" IS NOT FALSE`
+        clause: `${alias}.${fieldName} IS NOT FALSE`
       }
     case 'is_not_true':
       return {
-        clause: `"${alias}"."${fieldName}" IS NOT TRUE`
+        clause: `${alias}.${fieldName} IS NOT TRUE`
       }
     case 'is_present':
       return {
-        clause: `"${alias}"."${fieldName}" IS PRESENT`
+        clause: `${alias}.${fieldName} IS PRESENT`
       }
     case 'is_blank':
       return {
-        clause: `"${alias}"."${fieldName}" IS BLANK`
+        clause: `${alias}.${fieldName} IS BLANK`
       }
     case 'is_empty_num_id':
       return {
-        clause: `"${alias}"."${fieldName}" IS EMPTY NUMERIC ID`
+        clause: `${alias}.${fieldName} IS EMPTY NUMERIC ID`
       }
 
     case 'between':
       return {
-        clause: `"${alias}"."${fieldName}" BETWEEN  :args${seq}_1 AND :args${seq}_2`,
+        clause: `${alias}.${fieldName} BETWEEN  :args${seq}_1 AND :args${seq}_2`,
         parameters: { [`args${seq}_1`]: value[0], [`args${seq}_2`]: value[1] }
       }
   }

package/server/utils/list-query-builder.ts

@@ -23,7 +23,7 @@ export const buildQuery = function (queryBuilder: any, params: any, context: any
   }
 
   if (domainRef) {
-    queryBuilder.andWhere(`"${queryBuilder.alias}"."domain_id" = :domainId`, { domainId })
+    queryBuilder.andWhere(`${queryBuilder.alias}.domain = :domainId`, { domainId })
   }
 
   if (pagination && pagination.page > 0 && pagination.limit > 0) {