diff --git a/src/common/customizations/defaults.js b/src/common/customizations/defaults.js index 70b5295a..70c5ad67 100644 --- a/src/common/customizations/defaults.js +++ b/src/common/customizations/defaults.js @@ -37,6 +37,9 @@ module.exports = { databaseEdit: false, schemaEdit: false, tableSettings: false, + tableOptions: false, + tableArray: false, + tableRealCount: false, viewSettings: false, triggerSettings: false, triggerFunctionSettings: false, @@ -49,13 +52,11 @@ module.exports = { unsigned: false, nullable: false, zerofill: false, - tableOptions: false, autoIncrement: false, comment: false, collation: false, definer: false, onUpdate: false, - tableArray: false, viewAlgorithm: false, viewSqlSecurity: false, viewUpdateOption: false, diff --git a/src/common/customizations/sqlite.js b/src/common/customizations/sqlite.js index 96e2a56f..ca736ad8 100644 --- a/src/common/customizations/sqlite.js +++ b/src/common/customizations/sqlite.js @@ -35,6 +35,8 @@ module.exports = { databaseEdit: false, schemaEdit: false, tableSettings: false, + tableArray: false, + tableRealCount: true, viewSettings: false, triggerSettings: false, triggerFunctionSettings: false, @@ -53,7 +55,6 @@ module.exports = { collation: false, definer: false, onUpdate: false, - tableArray: false, viewAlgorithm: false, viewSqlSecurity: false, viewUpdateOption: false, diff --git a/src/main/libs/clients/SQLiteClient.js b/src/main/libs/clients/SQLiteClient.js index 3b60d330..15209474 100644 --- a/src/main/libs/clients/SQLiteClient.js +++ b/src/main/libs/clients/SQLiteClient.js @@ -54,7 +54,7 @@ export class SQLiteClient extends AntaresCore { for (const db of filteredDatabases) { if (!schemas.has(db.name)) continue; - let { rows: tables } = await this.raw(`SELECT * FROM "${db.name}".sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%';`); + let { rows: tables } = await this.raw(`SELECT * FROM "${db.name}".sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name`); if (tables.length) { tables = tables.map(table => { table.Db = db.name; @@ -77,17 +77,7 @@ export class SQLiteClient extends AntaresCore { if (schemas.has(db.name)) { // TABLES const remappedTables = tablesArr.filter(table => table.Db === db.name).map(table => { - let tableType; - switch (table.Comment) { - case 'VIEW': - tableType = 'view'; - break; - default: - tableType = 'table'; - break; - } - - const tableSize = table.Data_length + table.Index_length; + const tableSize = 0; schemaSize += tableSize; return { @@ -246,7 +236,7 @@ export class SQLiteClient extends AntaresCore { * @memberof SQLiteClient */ async getTableApproximateCount ({ schema, table }) { - const { rows } = await this.raw(`SELECT table_rows "count" FROM information_schema.tables WHERE table_name = "${table}" AND table_schema = "${schema}"`); + const { rows } = await this.raw(`SELECT COUNT(*) AS count FROM "${schema}"."${table}"`); return rows.length ? rows[0].count : 0; } @@ -1182,10 +1172,12 @@ export class SQLiteClient extends AntaresCore { else if (Object.keys(this._query.insert).length) fromRaw = 'INTO'; - fromRaw += this._query.from ? ` ${this._query.schema ? `\`${this._query.schema}\`.` : ''}\`${this._query.from}\` ` : ''; + fromRaw += this._query.from ? ` ${this._query.schema ? `"${this._query.schema}".` : ''}"${this._query.from}" ` : ''; // WHERE - const whereArray = this._query.where.reduce(this._reducer, []); + const whereArray = this._query.where + .reduce(this._reducer, []) + ?.map(clausole => clausole.replace('= null', 'IS NULL')); const whereRaw = whereArray.length ? `WHERE ${whereArray.join(' AND ')} ` : ''; // UPDATE @@ -1258,9 +1250,26 @@ export class SQLiteClient extends AntaresCore { const keysArr = []; const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => { + let queryResult; + let affectedRows; + let fields; + const detectedTypes = {}; + const stmt = connection.prepare(query); - const queryResult = stmt.all(); - const fields = stmt.columns(); + if (stmt.reader) { + queryResult = stmt.all(); + fields = stmt.columns(); + + if (queryResult.length) { + fields.forEach(field => { + detectedTypes[field.name] = typeof queryResult[0][field.name]; + }); + } + } + else { + const info = queryResult = stmt.run(); + affectedRows = info.changes; + } const remappedFields = fields ? fields.map(field => { @@ -1272,7 +1281,7 @@ export class SQLiteClient extends AntaresCore { table: field.table, tableAlias: field.table, orgTable: field.table, - type: field.type + type: field.type !== null ? field.type : detectedTypes[field.name] }; }).filter(Boolean) : []; @@ -1282,7 +1291,7 @@ export class SQLiteClient extends AntaresCore { resolve({ duration: timeStop - timeStart, rows: Array.isArray(queryResult) ? queryResult.some(el => Array.isArray(el)) ? [] : queryResult : false, - report: !Array.isArray(queryResult) ? queryResult : false, + report: affectedRows !== undefined ? { affectedRows } : null, fields: remappedFields, keys: keysArr }); diff --git a/src/renderer/components/WorkspaceExploreBarSchema.vue b/src/renderer/components/WorkspaceExploreBarSchema.vue index 7d3c79fa..b744c45b 100644 --- a/src/renderer/components/WorkspaceExploreBarSchema.vue +++ b/src/renderer/components/WorkspaceExploreBarSchema.vue @@ -43,7 +43,7 @@
diff --git a/src/renderer/components/WorkspaceTabQuery.vue b/src/renderer/components/WorkspaceTabQuery.vue index bbb72cc8..aa93f5e2 100644 --- a/src/renderer/components/WorkspaceTabQuery.vue +++ b/src/renderer/components/WorkspaceTabQuery.vue @@ -93,7 +93,7 @@
{{ $t('word.results') }}: {{ resultsCount.toLocaleString() }}
-
+
{{ $t('message.affectedRows') }}: {{ affectedCount }}
@@ -170,7 +170,7 @@ export default { selectedSchema: null, resultsCount: 0, durationsCount: 0, - affectedCount: 0, + affectedCount: null, editorHeight: 200, isHistoryOpen: false }; @@ -255,9 +255,14 @@ export default { if (status === 'success') { this.results = Array.isArray(response) ? response : [response]; - this.resultsCount += this.results.reduce((acc, curr) => acc + (curr.rows ? curr.rows.length : 0), 0); - this.durationsCount += this.results.reduce((acc, curr) => acc + curr.duration, 0); - this.affectedCount += this.results.reduce((acc, curr) => acc + (curr.report ? curr.report.affectedRows : 0), 0); + this.resultsCount = this.results.reduce((acc, curr) => acc + (curr.rows ? curr.rows.length : 0), 0); + this.durationsCount = this.results.reduce((acc, curr) => acc + curr.duration, 0); + this.affectedCount = this.results + .filter(result => result.report !== null) + .reduce((acc, curr) => { + if (acc === null) acc = 0; + return acc + (curr.report ? curr.report.affectedRows : 0); + }, null); this.updateTabContent({ uid: this.connection.uid, @@ -285,7 +290,7 @@ export default { this.results = []; this.resultsCount = 0; this.durationsCount = 0; - this.affectedCount = 0; + this.affectedCount = null; }, resize (e) { const el = this.$refs.queryEditor.$el; diff --git a/src/renderer/components/WorkspaceTabTable.vue b/src/renderer/components/WorkspaceTabTable.vue index 1fda6749..d8cac0a1 100644 --- a/src/renderer/components/WorkspaceTabTable.vue +++ b/src/renderer/components/WorkspaceTabTable.vue @@ -120,7 +120,12 @@ {{ $t('word.results') }}: {{ results[0].rows.length | localeString }}
- {{ $t('word.total') }}: ≈ {{ approximateCount | localeString }} + {{ $t('word.total') }}: + ≈ + {{ approximateCount | localeString }} +
{{ schema }} @@ -231,6 +236,9 @@ export default { workspace () { return this.getWorkspace(this.connection.uid); }, + customizations () { + return this.workspace.customizations; + }, isTable () { return !!this.workspace.breadcrumbs.table; }, diff --git a/src/renderer/scss/_data-types.scss b/src/renderer/scss/_data-types.scss index 85f374ca..c82d6e60 100644 --- a/src/renderer/scss/_data-types.scss +++ b/src/renderer/scss/_data-types.scss @@ -17,10 +17,12 @@ ( "char": $string-color, "varchar": $string-color, + "longvarchar": $string-color, "text": $string-color, "tinytext": $string-color, "mediumtext": $string-color, "longtext": $string-color, + "string": $string-color, "json": $string-color, "name": $string-color, "character": $string-color, @@ -50,6 +52,7 @@ "oid": $number-color, "xid": $number-color, "money": $number-color, + "number": $number-color, "datetime": $date-color, "date": $date-color, "time": $date-color, diff --git a/src/renderer/store/modules/workspaces.store.js b/src/renderer/store/modules/workspaces.store.js index 39c07f5f..66eb9843 100644 --- a/src/renderer/store/modules/workspaces.store.js +++ b/src/renderer/store/modules/workspaces.store.js @@ -412,6 +412,11 @@ export default { indexTypes = require('common/index-types/postgresql'); customizations = require('common/customizations/postgresql'); break; + case 'sqlite': + // dataTypes = require('common/data-types/sqlite'); + // indexTypes = require('common/index-types/sqlite'); + customizations = require('common/customizations/sqlite'); + break; } const { status, response: version } = await Schema.getVersion(connection.uid);