sasat 0.17.1 → 0.17.2

package/lib/runtime/sasatDBDatasource.js

@@ -73,8 +73,8 @@ export class SasatDBDatasource {
     async executeQuery(query, fields) {
         const info = createQueryResolveInfo(this.tableName, fields, this.relationMap, this.tableInfo);
         const sql = queryToSql(query);
-        const resultRows = await this.client.rawQuery(sql);
         this.queryLogger(sql);
+        const resultRows = await this.client.rawQuery(sql);
         return hydrate(resultRows, info);
     }
     createIdentifiableExpression(entity) {

package/lib/runtime/sql/runQuery.d.ts

@@ -16,15 +16,6 @@ declare type PagingOption = ListQueryOption & {
 };
 export declare const createPagingInnerQuery: (tableName: string, tableAlias: string, fields: Fields, option: PagingOption, tableInfo: TableInfo) => Query;
 export declare const runQuery: (client: SQLExecutor, query: Query, resolveInfo: QueryResolveInfo) => Promise<unknown[]>;
-declare type RunFieldQueryArg = {
-    client: SQLExecutor;
-    queryOptions: QueryOptions;
-    tableInfo: TableInfo;
-    relationMap: RelationMap;
-    baseTableName: string;
-    fields: Fields;
-};
-export declare const runFieldQuery: ({ client, tableInfo, baseTableName, fields, relationMap, queryOptions, }: RunFieldQueryArg) => Promise<unknown[]>;
 declare type CreatePagingFieldQueryArg = {
     baseTableName: string;
     fields: Fields;

package/lib/runtime/sql/runQuery.js

@@ -1,9 +1,9 @@
-import { createQueryResolveInfo, } from '../dsl/query/createQueryResolveInfo.js';
 import { QExpr } from '../dsl/factory.js';
 import { unique } from '../util.js';
 import { queryToSql } from '../dsl/query/sql/queryToSql.js';
 import { hydrate, } from '../dsl/query/sql/hydrate.js';
 import { SELECT_ALIAS_SEPARATOR } from '../dsl/query/sql/nodeToSql.js';
+const notTypeName = (fieldName) => fieldName !== '__typename';
 export const createQuery = (baseTableName, fields, options, tableInfo, relationMap, context) => {
     let tableCount = 0;
     const select = [];
@@ -12,8 +12,9 @@ export const createQuery = (baseTableName, fields, options, tableInfo, relationM
         table.tableAlias = tableAlias;
         tableCount++;
         const info = tableInfo[tableName];
-        select.push(...unique([...table.fields, ...info.identifiableKeys]).map(it => {
-            const realName = info.columnMap[it];
+        select.push(...unique([...table.fields.filter(notTypeName), ...info.identifiableKeys])
+            .map(it => {
+            const realName = info.columnMap[it] || it;
             return QExpr.field(tableAlias, realName, tableAlias + SELECT_ALIAS_SEPARATOR + it);
         }));
         return QExpr.table(tableName, Object.entries(table.relations || {}).map(([relationName, table]) => {
@@ -32,7 +33,7 @@ export const createQuery = (baseTableName, fields, options, tableInfo, relationM
 export const createPagingInnerQuery = (tableName, tableAlias, fields, option, tableInfo) => {
     const map = tableInfo[tableName].columnMap;
     return {
-        select: fields.fields.map(it => QExpr.field(tableAlias, map[it])),
+        select: fields.fields.filter(notTypeName).map(it => QExpr.field(tableAlias, map[it])),
         from: QExpr.table(tableName, [], tableAlias),
         limit: option.numberOfItem,
         offset: option.offset,
@@ -48,11 +49,6 @@ export const runQuery = async (client, query, resolveInfo) => {
     const resultRows = await client.rawQuery(queryToSql(query));
     return hydrate(resultRows, resolveInfo);
 };
-export const runFieldQuery = async ({ client, tableInfo, baseTableName, fields, relationMap, queryOptions, }) => {
-    const query = createQuery(baseTableName, fields, queryOptions, tableInfo, relationMap);
-    const resolveInfo = createQueryResolveInfo(baseTableName, fields, relationMap, tableInfo);
-    return runQuery(client, query, resolveInfo);
-};
 export const createPagingFieldQuery = ({ baseTableName, fields, queryOption, pagingOption, tableInfo, relationMap, context, }) => {
     const tableAlias = fields.tableAlias || 't0';
     const innerQuery = createPagingInnerQuery(baseTableName, tableAlias, fields, pagingOption, tableInfo);

package/package.json

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