diff --git a/integration-tests/__tests__/deploy-database.spec.js b/integration-tests/__tests__/deploy-database.spec.js index 8b41b322e..416f904f5 100644 --- a/integration-tests/__tests__/deploy-database.spec.js +++ b/integration-tests/__tests__/deploy-database.spec.js @@ -297,4 +297,33 @@ describe('Deploy database', () => { expect(res.rows[0].val.toString()).toEqual('5'); }) ); + + test.each(engines.enginesPostgre.map(engine => [engine.label, engine]))( + 'Current timestamp default value - %s', + testWrapper(async (conn, driver, engine) => { + await testDatabaseDeploy(conn, driver, [ + [ + { + name: 't1.table.yaml', + json: { + name: 't1', + columns: [ + { name: 'id', type: 'int' }, + { + name: 'val', + type: 'timestamp', + default: 'current_timestamp', + }, + ], + primaryKey: ['id'], + }, + }, + ], + ]); + + await driver.query(conn, `insert into t1 (id) values (1)`); + const res = await driver.query(conn, ` select val from t1 where id = 1`); + expect(res.rows[0].val.toString().substring(0, 2)).toEqual('20'); + }) + ); }); diff --git a/integration-tests/engines.js b/integration-tests/engines.js index 5e8b57c00..8f10950d5 100644 --- a/integration-tests/engines.js +++ b/integration-tests/engines.js @@ -141,6 +141,10 @@ const filterLocal = [ '-CockroachDB', ]; +const enginesPostgre = engines.filter(x => x.label == 'PostgreSQL'); + module.exports = process.env.CITEST ? engines.filter(x => !x.skipOnCI) : engines.filter(x => filterLocal.find(y => x.label == y)); + +module.exports.enginesPostgre = enginesPostgre; diff --git a/package.json b/package.json index a5083d7e2..3f0baabf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "5.0.3", + "version": "5.0.4-beta.1", "name": "dbgate-all", "workspaces": [ "packages/*", diff --git a/packages/api/src/controllers/files.js b/packages/api/src/controllers/files.js index ddeda85b4..484429db5 100644 --- a/packages/api/src/controllers/files.js +++ b/packages/api/src/controllers/files.js @@ -8,6 +8,7 @@ const socket = require('../utility/socket'); const scheduler = require('./scheduler'); const getDiagramExport = require('../utility/getDiagramExport'); const apps = require('./apps'); +const getMapExport = require('../utility/getMapExport'); function serialize(format, data) { if (format == 'text') return data; @@ -187,6 +188,12 @@ module.exports = { return true; }, + exportMap_meta: true, + async exportMap({ filePath, geoJson }) { + await fs.writeFile(filePath, getMapExport(geoJson)); + return true; + }, + exportDiagram_meta: true, async exportDiagram({ filePath, html, css, themeType, themeClassName }) { await fs.writeFile(filePath, getDiagramExport(html, css, themeType, themeClassName)); diff --git a/packages/api/src/utility/getMapExport.js b/packages/api/src/utility/getMapExport.js new file mode 100644 index 000000000..194354be4 --- /dev/null +++ b/packages/api/src/utility/getMapExport.js @@ -0,0 +1,77 @@ +const getMapExport = (geoJson) => { + return ` + + + + + + + + + + + + + +
+ + + `; +}; + +module.exports = getMapExport; diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts index c3f5476fd..7f012324d 100644 --- a/packages/datalib/src/GridDisplay.ts +++ b/packages/datalib/src/GridDisplay.ts @@ -483,6 +483,22 @@ export abstract class GridDisplay { processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options) {} + createColumnExpression(col, source, alias?) { + let expr = null; + if (this.dialect.createColumnViewExpression) { + expr = this.dialect.createColumnViewExpression(col.columnName, col.dataType, source, alias); + if (expr) { + return expr; + } + } + return { + exprType: 'column', + alias: alias || col.columnName, + source, + ...col, + }; + } + createSelectBase(name: NamedObjectInfo, columns: ColumnInfo[], options) { if (!columns) return null; const orderColumnName = columns[0].columnName; @@ -492,12 +508,7 @@ export abstract class GridDisplay { name: _.pick(name, ['schemaName', 'pureName']), alias: 'basetbl', }, - columns: columns.map(col => ({ - exprType: 'column', - alias: col.columnName, - source: { alias: 'basetbl' }, - ...col, - })), + columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' })), orderBy: [ { exprType: 'column', diff --git a/packages/datalib/src/TableGridDisplay.ts b/packages/datalib/src/TableGridDisplay.ts index fc0472071..9252c5ab2 100644 --- a/packages/datalib/src/TableGridDisplay.ts +++ b/packages/datalib/src/TableGridDisplay.ts @@ -267,12 +267,9 @@ export class TableGridDisplay extends GridDisplay { ) { for (const column of columns) { if (this.addAllExpandedColumnsToSelected || this.config.addedColumns.includes(column.uniqueName)) { - select.columns.push({ - exprType: 'column', - columnName: column.columnName, - alias: column.uniqueName, - source: { name: column, alias: parentAlias }, - }); + select.columns.push( + this.createColumnExpression(column, { name: column, alias: parentAlias }, column.uniqueName) + ); displayedColumnInfo[column.uniqueName] = { ...column, sourceAlias: parentAlias, diff --git a/packages/sqltree/src/dumpSqlExpression.ts b/packages/sqltree/src/dumpSqlExpression.ts index 433bb740f..7cd279a2f 100644 --- a/packages/sqltree/src/dumpSqlExpression.ts +++ b/packages/sqltree/src/dumpSqlExpression.ts @@ -35,17 +35,24 @@ export function dumpSqlExpression(dmp: SqlDumper, expr: Expression) { dmp.put(')'); break; + case 'methodCall': + dumpSqlExpression(dmp, expr.thisObject) + dmp.put('.%s(', expr.method); + dmp.putCollection(',', expr.args, x => dumpSqlExpression(dmp, x)); + dmp.put(')'); + break; + case 'transform': dmp.transform(expr.transform, () => dumpSqlExpression(dmp, expr.expr)); break; case 'rowNumber': - dmp.put(" ^row_number() ^over (^order ^by "); + dmp.put(' ^row_number() ^over (^order ^by '); dmp.putCollection(', ', expr.orderBy, x => { dumpSqlExpression(dmp, x); dmp.put(' %k', x.direction); }); - dmp.put(")"); + dmp.put(')'); break; } } diff --git a/packages/sqltree/src/evaluateExpression.ts b/packages/sqltree/src/evaluateExpression.ts index 5be138ec8..2f99943c6 100644 --- a/packages/sqltree/src/evaluateExpression.ts +++ b/packages/sqltree/src/evaluateExpression.ts @@ -20,6 +20,9 @@ export function evaluateExpression(expr: Expression, values) { case 'call': return null; + case 'methodCall': + return null; + case 'transform': return null; } diff --git a/packages/sqltree/src/types.ts b/packages/sqltree/src/types.ts index 44f80b824..4f7996c2c 100644 --- a/packages/sqltree/src/types.ts +++ b/packages/sqltree/src/types.ts @@ -155,6 +155,13 @@ export interface CallExpression { argsPrefix?: string; // DISTINCT in case of COUNT DISTINCT } +export interface MethodCallExpression { + exprType: 'methodCall'; + method: string; + args: Expression[]; + thisObject: Expression; +} + export interface TranformExpression { exprType: 'transform'; expr: Expression; @@ -172,6 +179,7 @@ export type Expression = | PlaceholderExpression | RawExpression | CallExpression + | MethodCallExpression | TranformExpression | RowNumberExpression; export type OrderByExpression = Expression & { direction: 'ASC' | 'DESC' }; diff --git a/packages/tools/src/stringTools.ts b/packages/tools/src/stringTools.ts index dc8fa14dd..0b5f7bbf1 100644 --- a/packages/tools/src/stringTools.ts +++ b/packages/tools/src/stringTools.ts @@ -84,3 +84,12 @@ export function getIconForRedisType(type) { return null; } } + +export function isWktGeometry(s) { + if (!_isString(s)) return false; + + // return !!s.match(/^POINT\s*\(|/) + return !!s.match( + /^POINT\s*\(|^LINESTRING\s*\(|^POLYGON\s*\(|^MULTIPOINT\s*\(|^MULTILINESTRING\s*\(|^MULTIPOLYGON\s*\(|^GEOMCOLLECTION\s*\(|^GEOMETRYCOLLECTION\s*\(/ + ); +} diff --git a/packages/tools/src/yamlModelConv.ts b/packages/tools/src/yamlModelConv.ts index d22fbd4f1..bf0c57982 100644 --- a/packages/tools/src/yamlModelConv.ts +++ b/packages/tools/src/yamlModelConv.ts @@ -1,4 +1,5 @@ import { ColumnInfo, TableInfo, ForeignKeyInfo, DatabaseInfo } from 'dbgate-types'; +import { StringNullableChain } from 'lodash'; import _cloneDeep from 'lodash/cloneDeep'; import _compact from 'lodash/compact'; import { DatabaseAnalyser } from './DatabaseAnalyser'; @@ -11,6 +12,7 @@ export interface ColumnInfoYaml { autoIncrement?: boolean; references?: string; primaryKey?: boolean; + default?: string; } export interface DatabaseModelFile { @@ -39,6 +41,7 @@ function columnInfoToYaml(column: ColumnInfo, table: TableInfo): ColumnInfoYaml const res: ColumnInfoYaml = { name: column.columnName, type: column.dataType, + default: column.defaultValue, }; if (column.autoIncrement) res.autoIncrement = true; if (column.notNull) res.notNull = true; @@ -71,6 +74,7 @@ function columnInfoFromYaml(column: ColumnInfoYaml, table: TableInfoYaml): Colum dataType: column.length ? `${column.type}(${column.length})` : column.type, autoIncrement: column.autoIncrement, notNull: column.notNull || (table.primaryKey && table.primaryKey.includes(column.name)), + defaultValue: column.default, }; return res; } diff --git a/packages/types/dialect.d.ts b/packages/types/dialect.d.ts index d42366159..70b241f1f 100644 --- a/packages/types/dialect.d.ts +++ b/packages/types/dialect.d.ts @@ -34,4 +34,7 @@ export interface SqlDialect { disableExplicitTransaction?: boolean; predefinedDataTypes: string[]; + + // create sql-tree expression + createColumnViewExpression(columnName: string, dataType: string, source: { alias: string }, alias?: string): any; } diff --git a/packages/web/package.json b/packages/web/package.json index 8a28f23d0..371109fea 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -57,6 +57,8 @@ "dependencies": { "chartjs-plugin-zoom": "^1.2.0", "date-fns": "^2.28.0", - "interval-operations": "^1.0.7" + "interval-operations": "^1.0.7", + "leaflet": "^1.8.0", + "wellknown": "^0.5.0" } } diff --git a/packages/web/src/celldata/MapCellView.svelte b/packages/web/src/celldata/MapCellView.svelte new file mode 100644 index 000000000..e0d080c5f --- /dev/null +++ b/packages/web/src/celldata/MapCellView.svelte @@ -0,0 +1,7 @@ + + + diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index f2406e4e5..607533ce0 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -112,6 +112,14 @@ onClick: () => getCurrentDataGrid().editJsonDocument(), }); + registerCommand({ + id: 'dataGrid.openSelectionInMap', + category: 'Data grid', + name: 'Open selection in map', + testEnabled: () => getCurrentDataGrid() != null, // ?.openSelectionInMapEnabled(), + onClick: () => getCurrentDataGrid().openSelectionInMap(), + }); + registerCommand({ id: 'dataGrid.viewJsonDocument', category: 'Data grid', @@ -306,6 +314,8 @@ import { apiCall } from '../utility/api'; import getElectron from '../utility/getElectron'; import { isCtrlOrCommandKey, isMac } from '../utility/common'; + import { selectionCouldBeShownOnMap } from '../elements/MapView.svelte'; + import ErrorMessageModal from '../modals/ErrorMessageModal.svelte'; export let onLoadNextData = undefined; export let grider = undefined; @@ -530,6 +540,23 @@ openJsonDocument(json); } + export function openSelectionInMap() { + const selection = getCellsPublished(selectedCells); + if (!selectionCouldBeShownOnMap(selection)) { + showModal(ErrorMessageModal, { message: 'There is nothing to be shown on map' }); + return; + } + openNewTab({ + title: 'Map', + icon: 'img map', + tabComponent: 'MapTab', + props: { + selection, + }, + }); + return; + } + function getSelectedExportableCell() { const electron = getElectron(); if (electron && selectedCells.length == 1) { @@ -1426,6 +1453,7 @@ { command: 'dataGrid.generateSqlFromData' }, { command: 'dataGrid.openFreeTable' }, { command: 'dataGrid.openChartFromSelection' }, + { command: 'dataGrid.openSelectionInMap', hideDisabled: true }, { placeTag: 'chart' } ); diff --git a/packages/web/src/elements/MapView.svelte b/packages/web/src/elements/MapView.svelte new file mode 100644 index 000000000..c6eff57a7 --- /dev/null +++ b/packages/web/src/elements/MapView.svelte @@ -0,0 +1,201 @@ + + + + +
{ + await tick(); + map.invalidateSize(); + }} +/> diff --git a/packages/web/src/icons/FontIcon.svelte b/packages/web/src/icons/FontIcon.svelte index f599e019e..c7ac644d5 100644 --- a/packages/web/src/icons/FontIcon.svelte +++ b/packages/web/src/icons/FontIcon.svelte @@ -165,6 +165,7 @@ 'img sort-asc': 'mdi mdi-sort-alphabetical-ascending color-icon-green', 'img sort-desc': 'mdi mdi-sort-alphabetical-descending color-icon-green', + 'img map': 'mdi mdi-map color-icon-blue', 'img reference': 'mdi mdi-link-box', 'img link': 'mdi mdi-link', diff --git a/packages/web/src/tabs/MapTab.svelte b/packages/web/src/tabs/MapTab.svelte new file mode 100644 index 000000000..0c21add56 --- /dev/null +++ b/packages/web/src/tabs/MapTab.svelte @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/packages/web/src/tabs/index.js b/packages/web/src/tabs/index.js index e629a1fbf..ae85d6635 100644 --- a/packages/web/src/tabs/index.js +++ b/packages/web/src/tabs/index.js @@ -24,6 +24,7 @@ import * as DiagramTab from './DiagramTab.svelte'; import * as DbKeyDetailTab from './DbKeyDetailTab.svelte'; import * as QueryDataTab from './QueryDataTab.svelte'; import * as ConnectionTab from './ConnectionTab.svelte'; +import * as MapTab from './MapTab.svelte'; export default { TableDataTab, @@ -52,4 +53,5 @@ export default { DbKeyDetailTab, QueryDataTab, ConnectionTab, + MapTab, }; diff --git a/packages/web/src/widgets/CellDataWidget.svelte b/packages/web/src/widgets/CellDataWidget.svelte index 06e391bdf..4d7b9c0a0 100644 --- a/packages/web/src/widgets/CellDataWidget.svelte +++ b/packages/web/src/widgets/CellDataWidget.svelte @@ -1,4 +1,6 @@