From f42c7235f14c7ea3a9f5202ca67b153c03262bae Mon Sep 17 00:00:00 2001
From: Ralf Aron <ralf.aron@iosb-ina.fraunhofer.de>
Date: Wed, 3 Jan 2024 21:09:19 +0100
Subject: [PATCH] fix: Renaming Query... to AASQuery...
---
.../src/app/aas-index/aas-index-query.ts | 4 ++--
.../src/app/aas-index/lowdb/lowdb-query.ts | 16 ++++++++--------
.../src/app/aas-index/mysql/mysql-query.ts | 16 ++++++++--------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/projects/aas-server/src/app/aas-index/aas-index-query.ts b/projects/aas-server/src/app/aas-index/aas-index-query.ts
index f5558e7a..1244aa62 100644
--- a/projects/aas-server/src/app/aas-index/aas-index-query.ts
+++ b/projects/aas-server/src/app/aas-index/aas-index-query.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { Query, QueryParser } from 'common';
+import { AASQuery, QueryParser } from 'common';
export abstract class AASIndexQuery {
protected constructor(query: string, protected readonly language: string) {
@@ -19,7 +19,7 @@ export abstract class AASIndexQuery {
return typeof value === 'string';
}
- protected isQuery(value: unknown): value is Query {
+ protected isQuery(value: unknown): value is AASQuery {
return typeof value === 'object' && !Array.isArray(value);
}
}
\ No newline at end of file
diff --git a/projects/aas-server/src/app/aas-index/lowdb/lowdb-query.ts b/projects/aas-server/src/app/aas-index/lowdb/lowdb-query.ts
index 51f411c5..8877595a 100644
--- a/projects/aas-server/src/app/aas-index/lowdb/lowdb-query.ts
+++ b/projects/aas-server/src/app/aas-index/lowdb/lowdb-query.ts
@@ -7,7 +7,7 @@
*****************************************************************************/
import { normalize } from 'path';
-import { AASDocument, BaseValueType, Query, QueryOperator, QueryValueType } from 'common';
+import { AASDocument, BaseValueType, AASQuery, AASQueryOperator, AASQueryValueType } from 'common';
import { LowDbDocument, LowDbElement, LowDbElementValueType } from './lowdb-types.js';
import { AASIndexQuery } from '../aas-index-query.js';
@@ -51,7 +51,7 @@ export class LowDbQuery extends AASIndexQuery {
document.endpoint.toLocaleLowerCase(this.language).indexOf(expression) >= 0;
}
- private match(elements: LowDbElement[], query: Query | undefined): boolean {
+ private match(elements: LowDbElement[], query: AASQuery | undefined): boolean {
if (query) {
if (elements.some(element => this.any(element, query))) {
return true;
@@ -61,7 +61,7 @@ export class LowDbQuery extends AASIndexQuery {
return false;
}
- private any(element: LowDbElement, query: Query): boolean {
+ private any(element: LowDbElement, query: AASQuery): boolean {
if (element.modelType === query.modelType) {
if (this.containsString(element.idShort, query.name)) {
if (!element || !query.value) {
@@ -77,7 +77,7 @@ export class LowDbQuery extends AASIndexQuery {
return false;
}
- private matchElement(element: LowDbElement, value: QueryValueType, operator?: QueryOperator): boolean {
+ private matchElement(element: LowDbElement, value: AASQueryValueType, operator?: AASQueryOperator): boolean {
switch (element.modelType) {
case 'prop':
return this.matchProperty(element, value, operator);
@@ -90,7 +90,7 @@ export class LowDbQuery extends AASIndexQuery {
}
}
- private matchProperty(element: LowDbElement, b: QueryValueType, operator: QueryOperator = '='): boolean {
+ private matchProperty(element: LowDbElement, b: AASQueryValueType, operator: AASQueryOperator = '='): boolean {
if (!element.value || !element.valueType) {
return false;
}
@@ -123,7 +123,7 @@ export class LowDbQuery extends AASIndexQuery {
return b == null || a.toLowerCase().indexOf(b.toLowerCase()) >= 0;
}
- private matchNumber(a: number, b: QueryValueType, operator: QueryOperator): boolean {
+ private matchNumber(a: number, b: AASQueryValueType, operator: AASQueryOperator): boolean {
if (typeof b === 'number') {
switch (operator) {
case '<':
@@ -148,7 +148,7 @@ export class LowDbQuery extends AASIndexQuery {
return false;
}
- private matchBigInt(a: bigint, b: QueryValueType, operator: QueryOperator): boolean {
+ private matchBigInt(a: bigint, b: AASQueryValueType, operator: AASQueryOperator): boolean {
if (typeof b === 'bigint') {
switch (operator) {
case '<':
@@ -173,7 +173,7 @@ export class LowDbQuery extends AASIndexQuery {
return false;
}
- private matchDate(a: Date, b: QueryValueType, operator: QueryOperator): boolean {
+ private matchDate(a: Date, b: AASQueryValueType, operator: AASQueryOperator): boolean {
if (b instanceof Date) {
switch (operator) {
case '<':
diff --git a/projects/aas-server/src/app/aas-index/mysql/mysql-query.ts b/projects/aas-server/src/app/aas-index/mysql/mysql-query.ts
index 8ccf28b9..e9615b13 100644
--- a/projects/aas-server/src/app/aas-index/mysql/mysql-query.ts
+++ b/projects/aas-server/src/app/aas-index/mysql/mysql-query.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { Query, QueryOperator } from 'common';
+import { AASQuery, AASQueryOperator } from 'common';
import { AASIndexQuery } from '../aas-index-query.js';
export class MySqlQuery extends AASIndexQuery {
@@ -49,7 +49,7 @@ export class MySqlQuery extends AASIndexQuery {
}
}
- private createSqlTerm(query: Query, values: unknown[]): string {
+ private createSqlTerm(query: AASQuery, values: unknown[]): string {
let s = `elements.modelType = "${query.modelType.toLowerCase()}"`;
if (query.name) {
s += ` AND elements.idShort LIKE '%${query.name}%'`
@@ -84,7 +84,7 @@ export class MySqlQuery extends AASIndexQuery {
return typeof value === 'bigint' || Array.isArray(value) && typeof value[0] === 'bigint';
}
- private createDateSqlTerm(operator: QueryOperator, value: Date | [Date, Date], values: unknown[]): string {
+ private createDateSqlTerm(operator: AASQueryOperator, value: Date | [Date, Date], values: unknown[]): string {
if (Array.isArray(value)) {
values.push(value[0]);
values.push(value[1])
@@ -95,7 +95,7 @@ export class MySqlQuery extends AASIndexQuery {
return ` AND elements.dateValue ${this.toMySqlOperator(operator)} ?`;
}
- private createNumberSqlTerm(operator: QueryOperator, value: number | [number, number], values: unknown[]): string {
+ private createNumberSqlTerm(operator: AASQueryOperator, value: number | [number, number], values: unknown[]): string {
if (Array.isArray(value)) {
values.push(value[0]);
values.push(value[1])
@@ -106,7 +106,7 @@ export class MySqlQuery extends AASIndexQuery {
return ` AND elements.numberValue ${this.toMySqlOperator(operator)} ?`;
}
- private createBigintSqlTerm(operator: QueryOperator, value: bigint | [bigint, bigint], values: unknown[]): string {
+ private createBigintSqlTerm(operator: AASQueryOperator, value: bigint | [bigint, bigint], values: unknown[]): string {
if (Array.isArray(value)) {
values.push(value[0]);
values.push(value[1])
@@ -117,7 +117,7 @@ export class MySqlQuery extends AASIndexQuery {
return ` AND elements.bigintValue ${this.toMySqlOperator(operator)} ?`;
}
- private createBooleanSqlTerm(operator: QueryOperator, value: boolean, values: unknown[]): string {
+ private createBooleanSqlTerm(operator: AASQueryOperator, value: boolean, values: unknown[]): string {
if (operator === '=') {
return ` AND elements.booleanValue ?`;
}
@@ -131,7 +131,7 @@ export class MySqlQuery extends AASIndexQuery {
throw new Error('Invalid operator.');
}
- private createStringSqlTerm(operator: QueryOperator, value: string): string {
+ private createStringSqlTerm(operator: AASQueryOperator, value: string): string {
if (operator === '=') {
return ` AND elements.stringValue LIKE '%${value}%'`;
}
@@ -143,7 +143,7 @@ export class MySqlQuery extends AASIndexQuery {
throw new Error('Invalid operator.');
}
- private toMySqlOperator(operator: QueryOperator): string {
+ private toMySqlOperator(operator: AASQueryOperator): string {
return operator === '!=' ? '<>' : operator;
}
}
\ No newline at end of file