dbgate-datalib 5.4.1 → 5.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/GridDisplay.js +2 -2
- package/lib/ViewGridDisplay.d.ts +2 -2
- package/lib/ViewGridDisplay.js +2 -2
- package/package.json +5 -5
package/lib/GridDisplay.js
CHANGED
|
@@ -444,7 +444,7 @@ class GridDisplay {
|
|
|
444
444
|
columns: [
|
|
445
445
|
...select.columns,
|
|
446
446
|
{
|
|
447
|
-
alias: '
|
|
447
|
+
alias: '_RowNumber',
|
|
448
448
|
exprType: 'rowNumber',
|
|
449
449
|
orderBy: select.orderBy
|
|
450
450
|
? select.orderBy.map(x => x.exprType != 'column'
|
|
@@ -494,7 +494,7 @@ class GridDisplay {
|
|
|
494
494
|
return null;
|
|
495
495
|
if (this.dialect.rangeSelect)
|
|
496
496
|
select.range = { offset: offset, limit: count };
|
|
497
|
-
else if (this.dialect.rowNumberOverPaging && offset > 0)
|
|
497
|
+
else if (this.dialect.rowNumberOverPaging && (offset > 0 || !this.dialect.topRecords))
|
|
498
498
|
select = this.getRowNumberOverSelect(select, offset, count);
|
|
499
499
|
else if (this.dialect.limitSelect)
|
|
500
500
|
select.topRecords = count;
|
package/lib/ViewGridDisplay.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
|
|
2
|
-
import type { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types';
|
|
2
|
+
import type { EngineDriver, ViewInfo, ColumnInfo, DatabaseInfo } from 'dbgate-types';
|
|
3
3
|
import { GridConfig, GridCache } from './GridConfig';
|
|
4
4
|
export declare class ViewGridDisplay extends GridDisplay {
|
|
5
5
|
view: ViewInfo;
|
|
6
|
-
constructor(view: ViewInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, serverVersion: any);
|
|
6
|
+
constructor(view: ViewInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, serverVersion: any);
|
|
7
7
|
getDisplayColumns(view: ViewInfo): {
|
|
8
8
|
isChecked: boolean;
|
|
9
9
|
pureName: string;
|
package/lib/ViewGridDisplay.js
CHANGED
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ViewGridDisplay = void 0;
|
|
4
4
|
const GridDisplay_1 = require("./GridDisplay");
|
|
5
5
|
class ViewGridDisplay extends GridDisplay_1.GridDisplay {
|
|
6
|
-
constructor(view, driver, config, setConfig, cache, setCache, serverVersion) {
|
|
7
|
-
super(config, setConfig, cache, setCache, driver, serverVersion);
|
|
6
|
+
constructor(view, driver, config, setConfig, cache, setCache, dbinfo, serverVersion) {
|
|
7
|
+
super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
|
|
8
8
|
this.view = view;
|
|
9
9
|
this.columns = this.getDisplayColumns(view);
|
|
10
10
|
this.formColumns = this.columns;
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "5.4.
|
|
2
|
+
"version": "5.4.3",
|
|
3
3
|
"name": "dbgate-datalib",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"typings": "lib/index.d.ts",
|
|
@@ -13,12 +13,12 @@
|
|
|
13
13
|
"lib"
|
|
14
14
|
],
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"dbgate-sqltree": "^5.4.
|
|
17
|
-
"dbgate-tools": "^5.4.
|
|
18
|
-
"dbgate-filterparser": "^5.4.
|
|
16
|
+
"dbgate-sqltree": "^5.4.3",
|
|
17
|
+
"dbgate-tools": "^5.4.3",
|
|
18
|
+
"dbgate-filterparser": "^5.4.3"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"dbgate-types": "^5.4.
|
|
21
|
+
"dbgate-types": "^5.4.3",
|
|
22
22
|
"@types/node": "^13.7.0",
|
|
23
23
|
"jest": "^28.1.3",
|
|
24
24
|
"ts-jest": "^28.0.7",
|