📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Replace ALTER TABLE DELETE query with DELETE FROM
Blue Mousead38e11ae295
diff --git a/backend/apps/production/src/project/project.controller.ts b/backend/apps/production/src/project/project.controller.tsindex 271dcf9e5..beff79db0 100644--- a/backend/apps/production/src/project/project.controller.ts+++ b/backend/apps/production/src/project/project.controller.ts@@ -761,16 +761,16 @@ export class ProjectController {this.projectService.allowedToManage(project, uid, user.roles)const queries = [- 'ALTER table analytics DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table customEV DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table performance DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table errors DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table error_statuses DELETE WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM analytics WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM customEV WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM performance WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM errors WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM error_statuses WHERE pid={pid:FixedString(12)}',]try {const promises = _map(queries, async query =>- clickhouse.query({+ clickhouse.command({query,query_params: {pid: id,@@ -819,8 +819,8 @@ export class ProjectController {this.projectService.allowedToManage(project, uid, user.roles)try {- await clickhouse.query({- query: 'ALTER table captcha DELETE WHERE pid={pid:FixedString(12)}',+ await clickhouse.command({+ query: 'DELETE FROM captcha WHERE pid={pid:FixedString(12)}',query_params: {pid: id,},@@ -905,8 +905,8 @@ export class ProjectController {this.projectService.allowedToManage(project, uid, user.roles)try {- await clickhouse.query({- query: 'ALTER table captcha DELETE WHERE pid={pid:FixedString(12)}',+ await clickhouse.command({+ query: 'DELETE FROM captcha WHERE pid={pid:FixedString(12)}',query_params: {pid: id,},@@ -1586,17 +1586,17 @@ export class ProjectController {this.projectService.allowedToManage(project, uid, user.roles)const queries = [- 'ALTER table analytics DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table customEV DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table performance DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table errors DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table error_statuses DELETE WHERE pid={pid:FixedString(12)}',- 'ALTER table captcha DELETE WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM analytics WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM customEV WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM performance WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM errors WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM error_statuses WHERE pid={pid:FixedString(12)}',+ 'DELETE FROM captcha WHERE pid={pid:FixedString(12)}',]try {const promises = _map(queries, async query =>- clickhouse.query({+ clickhouse.command({query,query_params: {pid: id,diff --git a/backend/apps/production/src/project/project.service.ts b/backend/apps/production/src/project/project.service.tsindex a51d41ca0..56ef46a63 100644--- a/backend/apps/production/src/project/project.service.ts+++ b/backend/apps/production/src/project/project.service.ts@@ -575,7 +575,7 @@ export class ProjectService {)}- let query = `ALTER TABLE analytics DELETE WHERE pid={pid:FixedString(12)} AND (`+ let query = `DELETE FROM analytics WHERE pid={pid:FixedString(12)} AND (`const params = {pid,@@ -593,7 +593,7 @@ export class ProjectService {query += ')'- await clickhouse.query({+ await clickhouse.command({query,query_params: params,})@@ -604,46 +604,28 @@ export class ProjectService {from: string,to: string,): Promise<void> {- const queryAnalytics =- 'ALTER TABLE analytics DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryCustomEvents =- 'ALTER TABLE customEV DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryPerformance =- 'ALTER TABLE performance DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryErrors =- 'ALTER TABLE errors DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryErrorStatuses =- 'ALTER TABLE error_statuses DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'+ const queries = [+ 'DELETE FROM analytics WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM customEV WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM errors WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM error_statuses WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ ]+const params = {- params: {- pid,- from,- to,- },+ pid,+ from,+ to,}- await Promise.all([- clickhouse.query({- query: queryAnalytics,- query_params: params,- }),- clickhouse.query({- query: queryCustomEvents,- query_params: params,- }),- clickhouse.query({- query: queryPerformance,- query_params: params,- }),- clickhouse.query({- query: queryErrors,- query_params: params,- }),- clickhouse.query({- query: queryErrorStatuses,- query_params: params,- }),- ])+ await Promise.all(+ _map(queries, query =>+ clickhouse.command({+ query,+ query_params: params,+ }),+ ),+ )}validateOrigins(diff --git a/backend/apps/production/src/user/user.controller.ts b/backend/apps/production/src/user/user.controller.tsindex ea6fb5281..66e9f1841 100644--- a/backend/apps/production/src/user/user.controller.ts+++ b/backend/apps/production/src/user/user.controller.ts@@ -323,18 +323,18 @@ export class UserController {)const queries = [- `ALTER table analytics DELETE WHERE pid IN (${pids})`,- `ALTER table customEV DELETE WHERE pid IN (${pids})`,- `ALTER table performance DELETE WHERE pid IN (${pids})`,- `ALTER table errors DELETE WHERE pid IN (${pids})`,- `ALTER table error_statuses DELETE WHERE pid IN (${pids})`,- `ALTER table captcha DELETE WHERE pid IN (${pids})`,+ `DELETE FROM analytics WHERE pid IN (${pids})`,+ `DELETE FROM customEV WHERE pid IN (${pids})`,+ `DELETE FROM performance WHERE pid IN (${pids})`,+ `DELETE FROM errors WHERE pid IN (${pids})`,+ `DELETE FROM error_statuses WHERE pid IN (${pids})`,+ `DELETE FROM captcha WHERE pid IN (${pids})`,]await this.projectService.deleteMultiple(pids)const promises = _map(queries, async query =>- clickhouse.query({+ clickhouse.command({query,}),)@@ -377,16 +377,16 @@ export class UserController {',',)const queries = [- `ALTER table analytics DELETE WHERE pid IN (${pids})`,- `ALTER table customEV DELETE WHERE pid IN (${pids})`,- `ALTER table performance DELETE WHERE pid IN (${pids})`,- `ALTER table errors DELETE WHERE pid IN (${pids})`,- `ALTER table error_statuses DELETE WHERE pid IN (${pids})`,- `ALTER table captcha DELETE WHERE pid IN (${pids})`,+ `DELETE FROM analytics WHERE pid IN (${pids})`,+ `DELETE FROM customEV WHERE pid IN (${pids})`,+ `DELETE FROM performance WHERE pid IN (${pids})`,+ `DELETE FROM errors WHERE pid IN (${pids})`,+ `DELETE FROM error_statuses WHERE pid IN (${pids})`,+ `DELETE FROM captcha WHERE pid IN (${pids})`,]await this.projectService.deleteMultiple(pids)const promises = _map(queries, async query =>- clickhouse.query({+ clickhouse.command({query,}),)diff --git a/backend/apps/selfhosted/src/project/project.controller.ts b/backend/apps/selfhosted/src/project/project.controller.tsindex 01bfb7bc0..870907245 100644--- a/backend/apps/selfhosted/src/project/project.controller.ts+++ b/backend/apps/selfhosted/src/project/project.controller.ts@@ -222,11 +222,11 @@ export class ProjectController {}try {- await clickhouse.query({- query: `ALTER table analytics DELETE WHERE pid='${id}'`,+ await clickhouse.command({+ query: `DELETE FROM analytics WHERE pid='${id}'`,})- await clickhouse.query({- query: `ALTER table customEV DELETE WHERE pid='${id}'`,+ await clickhouse.command({+ query: `DELETE FROM customEV WHERE pid='${id}'`,})return 'Project resetted successfully'} catch (e) {@@ -453,11 +453,11 @@ export class ProjectController {await deleteProjectClickhouse(id)try {- await clickhouse.query({- query: `ALTER table analytics DELETE WHERE pid='${id}'`,+ await clickhouse.command({+ query: `DELETE FROM analytics WHERE pid='${id}'`,})- await clickhouse.query({- query: `ALTER table customEV DELETE WHERE pid='${id}'`,+ await clickhouse.command({+ query: `DELETE FROM customEV WHERE pid='${id}'`,})return 'Project deleted successfully'} catch (e) {diff --git a/backend/apps/selfhosted/src/project/project.service.ts b/backend/apps/selfhosted/src/project/project.service.tsindex 83e3875e1..a9d38988e 100644--- a/backend/apps/selfhosted/src/project/project.service.ts+++ b/backend/apps/selfhosted/src/project/project.service.ts@@ -247,46 +247,28 @@ export class ProjectService {from: string,to: string,): Promise<void> {- const queryAnalytics =- 'ALTER TABLE analytics DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryCustomEvents =- 'ALTER TABLE customEV DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryPerformance =- 'ALTER TABLE performance DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryErrors =- 'ALTER TABLE errors DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryErrorStatuses =- 'ALTER TABLE error_statuses DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'+ const queries = [+ 'DELETE FROM analytics WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM customEV WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM errors WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ 'DELETE FROM error_statuses WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}',+ ]+const params = {- params: {- pid,- from,- to,- },+ pid,+ from,+ to,}- await Promise.all([- clickhouse.query({- query: queryAnalytics,- query_params: params,- }),- clickhouse.query({- query: queryCustomEvents,- query_params: params,- }),- clickhouse.query({- query: queryPerformance,- query_params: params,- }),- clickhouse.query({- query: queryErrors,- query_params: params,- }),- clickhouse.query({- query: queryErrorStatuses,- query_params: params,- }),- ])+ await Promise.all(+ _map(queries, query =>+ clickhouse.command({+ query,+ query_params: params,+ }),+ ),+ )}formatToClickhouse(project: any): object {