sasat 0.19.35 → 0.19.37

package/lib/db/connectors/dbClient.d.ts

@@ -1,5 +1,5 @@
 export type QueryResponse = Array<{
-    [key: string]: string;
+    [key: string]: SqlValueType;
 }>;
 export interface CommandResponse {
     insertId: number;

package/lib/runtime/dsl/mutation/mutation.d.ts

@@ -9,6 +9,7 @@ export type Create = {
     table: string;
     values: ValueSet[];
     upsert?: string[];
+    ignore?: boolean;
 };
 export type Update = {
     table: string;

package/lib/runtime/dsl/mutation/mutation.js

@@ -13,7 +13,7 @@ const onDuplicateKeyUpdate = (columns) => {
 };
 export const createToSql = (dsl, tableInfo) => {
     const map = tableInfo[dsl.table].columnMap;
-    return `INSERT INTO ${escapeId(dsl.table)}(${dsl.values.map(it => escapeId(map[it.field]))}) VALUES(${dsl.values.map(it => escape(it.value))})${onDuplicateKeyUpdate(dsl.upsert)}`;
+    return `INSERT ${dsl.ignore ? 'IGNORE ' : ''}INTO ${escapeId(dsl.table)}(${dsl.values.map(it => escapeId(map[it.field]))}) VALUES(${dsl.values.map(it => escape(it.value))})${onDuplicateKeyUpdate(dsl.upsert)}`;
 };
 export const updateToSql = (dsl, tableInfo) => {
     const map = tableInfo[dsl.table].columnMap;

package/lib/runtime/dsl/query/query.d.ts

@@ -15,18 +15,25 @@ export declare enum QueryNodeKind {
     Sort = 12,
     Identifier = 13,
     Exists = 14,
-    Raw = 15
+    Raw = 15,
+    GroupBy = 16
 }
 export type LockMode = 'FOR UPDATE' | 'FOR SHARE';
 export type Query = {
     select: Select;
     from: QueryTable;
     where?: BooleanValueExpression;
+    groupBy?: GroupByExpr;
+    having?: BooleanValueExpression;
     sort?: Sort[];
     limit?: number;
     offset?: number;
     lock?: LockMode;
 };
+export type GroupByExpr = {
+    kind: QueryNodeKind.GroupBy;
+    cols: (Field | Identifier)[];
+};
 type Select = SelectExpr[];
 export declare const NO_ALIAS: "__SASAT_NO_ALIAS";
 export type Field = {

package/lib/runtime/dsl/query/query.js

@@ -16,5 +16,6 @@ export var QueryNodeKind;
     QueryNodeKind[QueryNodeKind["Identifier"] = 13] = "Identifier";
     QueryNodeKind[QueryNodeKind["Exists"] = 14] = "Exists";
     QueryNodeKind[QueryNodeKind["Raw"] = 15] = "Raw";
+    QueryNodeKind[QueryNodeKind["GroupBy"] = 16] = "GroupBy";
 })(QueryNodeKind || (QueryNodeKind = {}));
 export const NO_ALIAS = '__SASAT_NO_ALIAS';

package/lib/runtime/dsl/query/sql/queryToSql.js

@@ -13,6 +13,10 @@ export const queryToSql = (query) => {
     const select = query.select.map(Sql.select).join(', ');
     const join = getJoin(query.from).map(Sql.join).join(' ');
     const where = query.where ? ' WHERE ' + Sql.booleanValue(query.where) : '';
+    const groupBy = query.groupBy
+        ? ' GROUP BY' + query.groupBy.cols.map(Sql.value).join(',')
+        : '';
+    const having = query.having ? 'HAVING ' + Sql.booleanValue(query.having) : '';
     const sort = query.sort && query.sort.length !== 0
         ? ' ORDER BY ' + Sql.sorts(query.sort)
         : '';
@@ -23,6 +27,8 @@ export const queryToSql = (query) => {
     return (`SELECT ${select} FROM ${Sql.table(query.from)}` +
         join +
         where +
+        groupBy +
+        having +
         sort +
         limit +
         offset +

package/lib/runtime/sasatDBDatasource.d.ts

@@ -40,8 +40,11 @@ export declare abstract class SasatDBDatasource<Entity extends EntityType, Ident
     protected abstract getDefaultValueString(): Partial<{
         [P in keyof Entity]: Entity[P] | string | null | never;
     }> | never;
-    create(entity: Creatable, upsert?: {
-        updateColumns: string[];
+    create(entity: Creatable, option?: {
+        ignore?: boolean;
+        upsert?: {
+            updateColumns: string[];
+        };
     }): Promise<Entity>;
     upsert<T extends Creatable & Partial<Entity>>(entity: T, updateFields?: (keyof T)[]): Promise<Entity>;
     update(entity: Updatable): Promise<CommandResponse>;

package/lib/runtime/sasatDBDatasource.js

@@ -10,7 +10,7 @@ export class SasatDBDatasource {
         this.queryLogger = noop;
         this.commandLogger = noop;
     }
-    async create(entity, upsert) {
+    async create(entity, option) {
         const obj = {
             ...this.getDefaultValueString(),
             ...entity,
@@ -21,7 +21,8 @@ export class SasatDBDatasource {
                 field: column,
                 value,
             })),
-            upsert: upsert?.updateColumns,
+            upsert: option?.upsert?.updateColumns,
+            ignore: option?.ignore,
         };
         const sql = createToSql(dsl, this.tableInfo);
         this.commandLogger(sql);
@@ -35,7 +36,9 @@ export class SasatDBDatasource {
     }
     async upsert(entity, updateFields = this.primaryKeys) {
         return this.create(entity, {
-            updateColumns: this.fieldToColumn(updateFields),
+            upsert: {
+                updateColumns: this.fieldToColumn(updateFields),
+            },
         });
     }
     update(entity) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.19.35",
+  "version": "0.19.37",
   "repository": "https://github.com/nin138/sasat.git",
   "author": "nin138 <ninian138@gmail.com>",
   "license": "MIT",