dbgate-datalib 4.7.3-alpha.5 → 4.7.4-alpha.2

package/lib/CollectionGridDisplay.d.ts

@@ -4,5 +4,5 @@ import { GridConfig, GridCache } from './GridConfig';
 export declare function analyseCollectionDisplayColumns(rows: any, display: any): any[];
 export declare class CollectionGridDisplay extends GridDisplay {
     collection: CollectionInfo;
-    constructor(collection: CollectionInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, loadedRows: any, changeSet: any);
+    constructor(collection: CollectionInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, loadedRows: any, changeSet: any, readOnly?: boolean);
 }

package/lib/CollectionGridDisplay.js

@@ -89,7 +89,7 @@ function analyseCollectionDisplayColumns(rows, display) {
 }
 exports.analyseCollectionDisplayColumns = analyseCollectionDisplayColumns;
 class CollectionGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(collection, driver, config, setConfig, cache, setCache, loadedRows, changeSet) {
+    constructor(collection, driver, config, setConfig, cache, setCache, loadedRows, changeSet, readOnly = false) {
         super(config, setConfig, cache, setCache, driver);
         this.collection = collection;
         const changedDocs = lodash_1.default.compact(changeSet.updates.map(chs => chs.document));
@@ -97,7 +97,7 @@ class CollectionGridDisplay extends GridDisplay_1.GridDisplay {
         this.columns = analyseCollectionDisplayColumns([...(loadedRows || []), ...changedDocs, ...insertedDocs], this);
         this.filterable = true;
         this.sortable = true;
-        this.editable = true;
+        this.editable = !readOnly;
         this.supportsReload = true;
         this.isDynamicStructure = true;
         this.changeSetKeyFields = ['_id'];

package/lib/GridDisplay.d.ts

@@ -98,7 +98,7 @@ export declare abstract class GridDisplay {
     processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options: any): void;
     createSelectBase(name: NamedObjectInfo, columns: ColumnInfo[], options: any): Select;
     getRowNumberOverSelect(select: Select, offset: number, count: number): Select;
-    getPageQuery(offset: number, count: number): string;
+    getPageQuery(offset: number, count: number): Select;
     getExportQuery(postprocessSelect?: any): string;
     getExportColumnMap(): {
         dst: string;
@@ -106,7 +106,7 @@ export declare abstract class GridDisplay {
         ignore: boolean;
     }[];
     resizeColumn(uniqueName: string, computedSize: number, diff: number): void;
-    getCountQuery(): string;
+    getCountQuery(): Select;
     compileFilters(): Condition;
     switchToFormView(rowData: any): void;
     switchToJsonView(): void;

package/lib/GridDisplay.js

@@ -329,7 +329,10 @@ class GridDisplay {
         const orderColumnName = columns[0].columnName;
         const select = {
             commandType: 'select',
-            from: { name, alias: 'basetbl' },
+            from: {
+                name: lodash_1.default.pick(name, ['schemaName', 'pureName']),
+                alias: 'basetbl',
+            },
             columns: columns.map(col => (Object.assign({ exprType: 'column', alias: col.columnName, source: { alias: 'basetbl' } }, col))),
             orderBy: [
                 {
@@ -408,8 +411,9 @@ class GridDisplay {
             select = this.getRowNumberOverSelect(select, offset, count);
         else if (this.dialect.limitSelect)
             select.topRecords = count;
-        const sql = (0, dbgate_sqltree_1.treeToSql)(this.driver, select, dbgate_sqltree_1.dumpSqlSelect);
-        return sql;
+        return select;
+        // const sql = treeToSql(this.driver, select, dumpSqlSelect);
+        // return sql;
     }
     getExportQuery(postprocessSelect = null) {
         const select = this.createSelect({ isExport: true });
@@ -474,8 +478,9 @@ class GridDisplay {
                 },
             ];
         }
-        const sql = (0, dbgate_sqltree_1.treeToSql)(this.driver, select, dbgate_sqltree_1.dumpSqlSelect);
-        return sql;
+        return select;
+        // const sql = treeToSql(this.driver, select, dumpSqlSelect);
+        // return sql;
     }
     compileFilters() {
         var _a;

package/lib/TableFormViewDisplay.d.ts

@@ -2,26 +2,27 @@ import { FormViewDisplay } from './FormViewDisplay';
 import { ChangeCacheFunc, DisplayColumn, ChangeConfigFunc } from './GridDisplay';
 import { EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
-import { Select, Condition } from 'dbgate-sqltree';
+import { Condition } from 'dbgate-sqltree';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
 import { DictionaryDescriptionFunc } from '.';
 export declare class TableFormViewDisplay extends FormViewDisplay {
     tableName: NamedObjectInfo;
     private gridDisplay;
-    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc);
+    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc, isReadOnly?: boolean);
     addDisplayColumns(columns: DisplayColumn[]): void;
     getPrimaryKeyEqualCondition(row?: any): Condition;
     getPrimaryKeyOperatorCondition(operator: any): Condition;
-    getSelect(): Select;
-    getCurrentRowQuery(): string;
-    getCountSelect(): Select;
-    getCountQuery(): string;
-    getBeforeCountQuery(): string;
+    getSelect(): import("dbgate-sqltree").Select;
+    getCurrentRowQuery(): import("dbgate-sqltree").Select;
+    getCountSelect(): import("dbgate-sqltree").Select;
+    getCountQuery(): import("dbgate-sqltree").Select;
+    getBeforeCountQuery(): import("dbgate-sqltree").Select;
     navigate(row: any): void;
     isLoadedCurrentRow(row: any): boolean;
-    navigateRowQuery(commmand: 'begin' | 'previous' | 'next' | 'end'): string;
+    navigateRowQuery(commmand: 'begin' | 'previous' | 'next' | 'end'): import("dbgate-sqltree").Select;
     getChangeSetRow(row: any): ChangeSetRowDefinition;
     getChangeSetField(row: any, uniqueName: any): ChangeSetFieldDefinition;
     toggleExpandedColumn(uniqueName: string, value?: boolean): void;
     isExpandedColumn(uniqueName: string): boolean;
+    get editable(): boolean;
 }

package/lib/TableFormViewDisplay.js

@@ -9,10 +9,10 @@ const dbgate_sqltree_1 = require("dbgate-sqltree");
 const TableGridDisplay_1 = require("./TableGridDisplay");
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
-    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null) {
+    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null, isReadOnly = false) {
         super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
         this.tableName = tableName;
-        this.gridDisplay = new TableGridDisplay_1.TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription);
+        this.gridDisplay = new TableGridDisplay_1.TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription, isReadOnly);
         this.gridDisplay.addAllExpandedColumnsToSelected = true;
         this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly && !!this.driver;
         this.columns = [];
@@ -125,8 +125,7 @@ class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
         if (!select)
             return null;
         select.where = (0, dbgate_sqltree_1.mergeConditions)(select.where, this.getPrimaryKeyEqualCondition());
-        const sql = (0, dbgate_sqltree_1.treeToSql)(this.driver, select, dbgate_sqltree_1.dumpSqlSelect);
-        return sql;
+        return select;
     }
     getCountSelect() {
         const select = this.getSelect();
@@ -149,8 +148,7 @@ class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
         const select = this.getCountSelect();
         if (!select)
             return null;
-        const sql = (0, dbgate_sqltree_1.treeToSql)(this.driver, select, dbgate_sqltree_1.dumpSqlSelect);
-        return sql;
+        return select;
     }
     getBeforeCountQuery() {
         if (!this.driver)
@@ -159,8 +157,7 @@ class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
         if (!select)
             return null;
         select.where = (0, dbgate_sqltree_1.mergeConditions)(select.where, this.getPrimaryKeyOperatorCondition('<'));
-        const sql = (0, dbgate_sqltree_1.treeToSql)(this.driver, select, dbgate_sqltree_1.dumpSqlSelect);
-        return sql;
+        return select;
     }
     navigate(row) {
         const formViewKey = this.extractKey(row);
@@ -203,8 +200,7 @@ class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
                 select.where = (0, dbgate_sqltree_1.mergeConditions)(select.where, this.getPrimaryKeyOperatorCondition('>'));
                 break;
         }
-        const sql = (0, dbgate_sqltree_1.treeToSql)(this.driver, select, dbgate_sqltree_1.dumpSqlSelect);
-        return sql;
+        return select;
     }
     getChangeSetRow(row) {
         if (!this.baseTable)
@@ -232,5 +228,8 @@ class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
     isExpandedColumn(uniqueName) {
         return this.gridDisplay.isExpandedColumn(uniqueName);
     }
+    get editable() {
+        return this.gridDisplay.editable;
+    }
 }
 exports.TableFormViewDisplay = TableFormViewDisplay;

package/lib/TableGridDisplay.d.ts

@@ -15,7 +15,7 @@ export declare class TableGridDisplay extends GridDisplay {
     table: TableInfo;
     addAllExpandedColumnsToSelected: boolean;
     hintBaseColumns: DisplayColumn[];
-    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc);
+    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc, isReadOnly?: boolean);
     findTable({ schemaName, pureName }: {
         schemaName?: any;
         pureName: any;

package/lib/TableGridDisplay.js

@@ -4,7 +4,7 @@ exports.TableGridDisplay = void 0;
 const dbgate_tools_1 = require("dbgate-tools");
 const GridDisplay_1 = require("./GridDisplay");
 class TableGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null) {
+    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null, isReadOnly = false) {
         super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
         this.tableName = tableName;
         this.displayOptions = displayOptions;
@@ -23,7 +23,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         this.filterable = true;
         this.sortable = true;
         this.groupable = true;
-        this.editable = true;
+        this.editable = !isReadOnly;
         this.supportsReload = true;
         this.baseTable = this.table;
         if (this.table && this.table.columns) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.7.3-alpha.5",
+  "version": "4.7.4-alpha.2",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -11,11 +11,11 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^4.7.3-alpha.5",
-    "dbgate-filterparser": "^4.7.3-alpha.5"
+    "dbgate-sqltree": "^4.7.4-alpha.2",
+    "dbgate-filterparser": "^4.7.4-alpha.2"
   },
   "devDependencies": {
-    "dbgate-types": "^4.7.3-alpha.5",
+    "dbgate-types": "^4.7.4-alpha.2",
     "@types/node": "^13.7.0",
     "typescript": "^4.4.3"
   }