Compare commits
No commits in common. "main" and "v0.1.0" have entirely different histories.
16 changed files with 199 additions and 993 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,6 +1,4 @@
|
|||
dist
|
||||
node_modules
|
||||
ltests
|
||||
sqlsave
|
||||
postgresHandler.ts
|
||||
.vscode
|
||||
sqlsave
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
test.ts
|
||||
ltests
|
||||
sqlsave
|
||||
ltests
|
||||
|
|
@ -10,13 +10,9 @@ pipeline:
|
|||
- npm install git+https://jusax.de/git/jusax23/gitea-release.git
|
||||
- mkdir build
|
||||
- mkdir dblang
|
||||
- mkdir dblang/dist
|
||||
- mkdir upload
|
||||
- npm run prepublish
|
||||
- cp dist/* dblang/dist
|
||||
- cp package.json dblang
|
||||
- cp package-lock.json dblang
|
||||
- cp readme.md dblang
|
||||
- cp dist/* dblang
|
||||
- zip -r upload/DBlang.zip dblang/*
|
||||
- tar -czvf upload/DBlang.tar.gz dblang/*
|
||||
- npx gitea-release "https://jusax.de/git/api/v1/" "$${GITEA_TOKEN}" "$${CI_REPO}" "$${CI_COMMIT_BRANCH}" "$${CI_COMMIT_TAG}" "upload" "$${CI_COMMIT_MESSAGE}"
|
||||
|
|
|
|||
159
package-lock.json
generated
159
package-lock.json
generated
|
|
@ -1,25 +1,23 @@
|
|||
{
|
||||
"name": "dblang",
|
||||
"version": "0.9.6",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "dblang",
|
||||
"version": "0.9.6",
|
||||
"version": "1.0.0",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"mariadb": "^3.0.2",
|
||||
"pg": "^8.9.0"
|
||||
"mariadb": "^3.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^18.11.18",
|
||||
"@types/pg": "^8.6.6",
|
||||
"esbuild": "^0.17.4",
|
||||
"typescript": "^4.9.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 16"
|
||||
"node": ">= 14"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/android-arm": {
|
||||
|
|
@ -385,25 +383,6 @@
|
|||
"integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/pg": {
|
||||
"version": "8.6.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.6.tgz",
|
||||
"integrity": "sha512-O2xNmXebtwVekJDD+02udOncjVcMZQuTEQEMpKJ0ZRf5E7/9JJX3izhKUcUifBkyKpljyUM6BTgy2trmviKlpw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@types/node": "*",
|
||||
"pg-protocol": "*",
|
||||
"pg-types": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/buffer-writer": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
|
||||
"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/denque": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
|
||||
|
|
@ -508,133 +487,11 @@
|
|||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/packet-reader": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
|
||||
"integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
|
||||
},
|
||||
"node_modules/pg": {
|
||||
"version": "8.9.0",
|
||||
"resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz",
|
||||
"integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==",
|
||||
"dependencies": {
|
||||
"buffer-writer": "2.0.0",
|
||||
"packet-reader": "1.0.0",
|
||||
"pg-connection-string": "^2.5.0",
|
||||
"pg-pool": "^3.5.2",
|
||||
"pg-protocol": "^1.6.0",
|
||||
"pg-types": "^2.1.0",
|
||||
"pgpass": "1.x"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 8.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"pg-native": ">=3.0.1"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"pg-native": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/pg-connection-string": {
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
|
||||
"integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="
|
||||
},
|
||||
"node_modules/pg-int8": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
|
||||
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
|
||||
"engines": {
|
||||
"node": ">=4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-pool": {
|
||||
"version": "3.5.2",
|
||||
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
|
||||
"integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
|
||||
"peerDependencies": {
|
||||
"pg": ">=8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-protocol": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz",
|
||||
"integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="
|
||||
},
|
||||
"node_modules/pg-types": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
|
||||
"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
|
||||
"dependencies": {
|
||||
"pg-int8": "1.0.1",
|
||||
"postgres-array": "~2.0.0",
|
||||
"postgres-bytea": "~1.0.0",
|
||||
"postgres-date": "~1.0.4",
|
||||
"postgres-interval": "^1.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/pgpass": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
|
||||
"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
|
||||
"dependencies": {
|
||||
"split2": "^4.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-array": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
|
||||
"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-bytea": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
|
||||
"integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-date": {
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
|
||||
"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-interval": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
|
||||
"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
|
||||
"dependencies": {
|
||||
"xtend": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/safer-buffer": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
||||
},
|
||||
"node_modules/split2": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
|
||||
"integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==",
|
||||
"engines": {
|
||||
"node": ">= 10.x"
|
||||
}
|
||||
},
|
||||
"node_modules/typescript": {
|
||||
"version": "4.9.4",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
|
||||
|
|
@ -647,14 +504,6 @@
|
|||
"engines": {
|
||||
"node": ">=4.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/xtend": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
|
||||
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
|
||||
"engines": {
|
||||
"node": ">=0.4"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
14
package.json
14
package.json
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"name": "dblang",
|
||||
"version": "0.9.6",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "dist/db.js",
|
||||
"types": "dist/db.d.ts",
|
||||
"type": "module",
|
||||
"type": "commonjs",
|
||||
"directories": {
|
||||
"dist": "dist"
|
||||
"dsit": "dist"
|
||||
},
|
||||
"files": [
|
||||
"dist/*"
|
||||
"dist"
|
||||
],
|
||||
"private": false,
|
||||
"scripts": {
|
||||
|
|
@ -18,15 +18,13 @@
|
|||
"author": "jusax23",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"mariadb": "^3.0.2",
|
||||
"pg": "^8.9.0"
|
||||
"mariadb": "^3.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 16"
|
||||
"node": ">= 14"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^18.11.18",
|
||||
"@types/pg": "^8.6.6",
|
||||
"esbuild": "^0.17.4",
|
||||
"typescript": "^4.9.4"
|
||||
}
|
||||
|
|
|
|||
81
readme.md
81
readme.md
|
|
@ -4,17 +4,14 @@
|
|||
|
||||
TypeScript Libary for relational Database Requests. Requests are written in js/ts and it supports automatic Schema evulution.
|
||||
|
||||
Features:
|
||||
Fetures
|
||||
- [x] select Query
|
||||
- [x] insert Query
|
||||
- [x] update Query
|
||||
- [x] remove Query
|
||||
- [x] create Schema
|
||||
- [x] remove unused Schema
|
||||
- [x] joins
|
||||
- [x] table alias
|
||||
- [x] general aliases
|
||||
- [x] unified response
|
||||
- [ ] joins
|
||||
- [ ] change Schema
|
||||
- [ ] Key-Value Store Shortcut
|
||||
- [ ] Views
|
||||
|
|
@ -30,8 +27,7 @@ Supported Databses:
|
|||
|
||||
```javascript
|
||||
import { DB } from "dblang";
|
||||
const db = new DB();
|
||||
db.connect({
|
||||
const db = new DB({
|
||||
host: "localhost",
|
||||
user: "root",
|
||||
password: "0123456789",
|
||||
|
|
@ -97,7 +93,7 @@ See: [Modifiers](#modifier), [Aggregations](#aggregations)
|
|||
|
||||
#### Select:
|
||||
```javascript
|
||||
import { select } from "dblang"
|
||||
import {select} from "dblang"
|
||||
|
||||
let res = await select([Table2.AttrName2], Table1)
|
||||
.where(eq(Table2.AttrName2, 5)) //optional
|
||||
|
|
@ -105,52 +101,12 @@ let res = await select([Table2.AttrName2], Table1)
|
|||
.having(le(Table2.AttrName3, 5)) //optional
|
||||
.limit(10) //optional
|
||||
.query(db);
|
||||
```
|
||||
|
||||
_Joins_:
|
||||
```javascript
|
||||
import { INT, onAction } from "dblang"
|
||||
|
||||
const TableA = db.newTable("TableA");
|
||||
const TableB = db.newTable("TableB");
|
||||
TableA.addAttribute("A1", INT, {
|
||||
primaryKey: true
|
||||
});
|
||||
TableB.addAttribute("B1", INT, {
|
||||
primaryKey: true,
|
||||
foreignKey:{
|
||||
link: TableA.A1,
|
||||
onDelete: onAction.cascade
|
||||
}
|
||||
});
|
||||
let res = await select([TableA.A1, TableB.B1], innerJoinOn(eq(TableA.A1, Tableb.B1)))
|
||||
.query(db);
|
||||
```
|
||||
See: [Joins](#joins)
|
||||
|
||||
_Aliases_:
|
||||
```javascript
|
||||
const alias1 = TableA.createAlias("alias1");
|
||||
//alias1 can be used like a Table in select Statements.
|
||||
const alias2 = alias(avg(TableA.A1), "someAvg");
|
||||
```
|
||||
|
||||
Get requestet Data:
|
||||
```javascript
|
||||
let response = await select([TableA.A1, TableB.B1], innerJoinOn(eq(TableA.A1, Tableb.B1)))
|
||||
.query(db);
|
||||
|
||||
response[0][TableA.A1];
|
||||
response[0][TableB.B1];
|
||||
|
||||
response[i][TableA.A1];
|
||||
response[i][TableB.B1]; // i < repsonse.length
|
||||
|
||||
```
|
||||
|
||||
#### Insert:
|
||||
```javascript
|
||||
import { select } from "dblang"
|
||||
import {select} from "dblang"
|
||||
|
||||
await insert(Table2.AttrName2, Table2.AttrName3)
|
||||
.add(1, 2)
|
||||
|
|
@ -165,8 +121,6 @@ await insert(Table2.AttrName2, Table2.AttrName3)
|
|||
|
||||
#### Update:
|
||||
```javascript
|
||||
import { update } from "dblang"
|
||||
|
||||
await update(Table2)
|
||||
.set(Table2.AttrName2, plus(Table2.AttrName2,1))
|
||||
.set(Table2.AttrName3, minus(Table2.AttrName2,1))
|
||||
|
|
@ -176,8 +130,6 @@ await update(Table2)
|
|||
|
||||
#### Remove:
|
||||
```javascript
|
||||
import { remove } from "dblang"
|
||||
|
||||
await remove(Table2)
|
||||
.where(geq(Table2.AttrName2, 5))
|
||||
.query(db);
|
||||
|
|
@ -241,7 +193,6 @@ BooleanModifier:
|
|||
- `le(v1, v2, ...)`
|
||||
- `not(v1)`
|
||||
- `like(v1, v2)`
|
||||
- `exists(s)`
|
||||
|
||||
NumberModifier:
|
||||
- `plus(v1, v2, ...)`
|
||||
|
|
@ -252,27 +203,9 @@ NumberModifier:
|
|||
StringModifier:
|
||||
- `concat(v1, v2, ...)`
|
||||
|
||||
(v\* = string, number, boolean, null, Modifier, Aggregation, select Query, Attribute; s = selectQuery)
|
||||
(v\* = string, number, boolean, null, Modifier, Aggregation, select Query, Attribute)
|
||||
|
||||
#### Joins
|
||||
|
||||
- `crossJoin(t1, t2, ...)`
|
||||
- `naturalJoin(t1, t2, ...)`
|
||||
- `leftNaturalJoin(t1, t2, ...)`
|
||||
- `rightNaturalJoin(t1, t2, ...)`
|
||||
- `fullNaturalJoin(t1, t2, ...)`
|
||||
- `innerJoinUsing(t1, t2, a1, a2, ...)`
|
||||
- `leftJoinUsing(t1, t2, a1, a2, ...)`
|
||||
- `rightJoinUsing(t1, t2, a1, a2, ...)`
|
||||
- `fullJoinUsing(t1, t2, a1, a2, ...)`
|
||||
- `innerJoinOn(t1, t2, b)`
|
||||
- `leftJoinOn(t1, t2, b)`
|
||||
- `rightJoinOn(t1, t2, b)`
|
||||
- `fullJoinOn(t1, t2, b)`
|
||||
|
||||
(t\* = Table or Join; a\* = Attributes; b = Boolean Modifier)
|
||||
|
||||
#### Aggregations
|
||||
# Aggregations
|
||||
- `count(a)`
|
||||
- `sum(a)`
|
||||
- `avg(a)`
|
||||
|
|
|
|||
90
src/alias.ts
90
src/alias.ts
|
|
@ -1,90 +0,0 @@
|
|||
import { Attribute, DB, Table } from "./db.js"
|
||||
import { Aggregation, Modifier } from "./dbStructure.js";
|
||||
import { Handler } from "./defaultHandler.js";
|
||||
import { QueryBuilder, selectQuery } from "./query.js";
|
||||
import { selectElements } from "./types.js";
|
||||
|
||||
export class AttributeAlias {
|
||||
name: string;
|
||||
nameO: string;
|
||||
table: TableAlias;
|
||||
attr: Attribute;
|
||||
constructor(attr: Attribute, table: TableAlias) {
|
||||
this.name = attr.name;
|
||||
this.nameO = attr.nameO;
|
||||
this.attr = attr;
|
||||
this.table = table;
|
||||
}
|
||||
serialize(handler: Handler) {
|
||||
return handler.builders.escapeID(this.name);
|
||||
}
|
||||
getString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
|
||||
return this.table.serialize(handler) + "." + this.serialize(handler);
|
||||
}
|
||||
getStringFunc(handler: Handler) {
|
||||
return this.table.serialize(handler) + "(" + this.serialize(handler) + ")";
|
||||
}
|
||||
toString() {
|
||||
return this.table.dbLangTableName + "_" + this.name;
|
||||
}
|
||||
}
|
||||
|
||||
export class TableAlias {
|
||||
dbLangTableName: string;
|
||||
dbLangTableAttributes: { [key: string]: AttributeAlias; } = {};
|
||||
dbLangDatabaseInstance: DB;
|
||||
dbLangTableInstance: Table;
|
||||
[key: string]: AttributeAlias | any;
|
||||
constructor(name: string, table: Table) {
|
||||
this.dbLangTableName = name;
|
||||
this.dbLangTableInstance = table;
|
||||
this.dbLangDatabaseInstance = table.dbLangDatabaseInstance;
|
||||
let keys = Object.keys(table.dbLangTableAttributes);
|
||||
for (let i = 0; i < keys.length; i++) {
|
||||
const a = table.dbLangTableAttributes[keys[i]];
|
||||
let attrAlias = new AttributeAlias(a, this);
|
||||
this[a.name] = attrAlias;
|
||||
this[a.nameO] = attrAlias;
|
||||
this.dbLangTableAttributes[a.name] = attrAlias;
|
||||
}
|
||||
}
|
||||
serializeAlias(hander: Handler) {
|
||||
return this.dbLangTableInstance.serialize(hander) + " " + this.toString(hander);
|
||||
}
|
||||
serialize(handler: Handler) {
|
||||
return this.toString(handler);
|
||||
}
|
||||
toString(handler: Handler = this.dbLangDatabaseInstance.getHandler()) {
|
||||
return handler.builders.escapeID(this.dbLangTableName);
|
||||
}
|
||||
}
|
||||
|
||||
export class Alias {
|
||||
alias: string;
|
||||
a: selectElements;
|
||||
|
||||
constructor(a: selectElements, alias: string) {
|
||||
this.alias = alias;
|
||||
this.a = a;
|
||||
}
|
||||
|
||||
serialize(handler: Handler) {
|
||||
let builder = new QueryBuilder();
|
||||
if (this.a instanceof Attribute || this.a instanceof AttributeAlias)
|
||||
builder.addCode(this.a.getString(handler) + " " + handler.builders.escapeID(this.a.toString()));
|
||||
else if (this.a instanceof Modifier || this.a instanceof selectQuery || this.a instanceof Aggregation || this.a instanceof Alias) {
|
||||
builder.addCode("(");
|
||||
builder.append(this.a.serialize(handler));
|
||||
builder.addCode(")");
|
||||
} else {
|
||||
builder.addInjection(this.a);
|
||||
}
|
||||
return builder;
|
||||
}
|
||||
getString(handler: Handler) {
|
||||
return this.serialize(handler);
|
||||
}
|
||||
toString() {
|
||||
return this.alias;
|
||||
}
|
||||
}
|
||||
101
src/db.ts
101
src/db.ts
|
|
@ -1,63 +1,34 @@
|
|||
import mariadb from 'mariadb';
|
||||
import { checkConstraint, Constraint, Datatype, foreignConstraint, uniqueConstraint } from './dbStructure.js';
|
||||
import { Handler } from './defaultHandler.js';
|
||||
import { Query } from './query.js';
|
||||
import { attributeSettings, extendedAttributeSettings, onAction, dbType, order } from './types.js';
|
||||
import { TableAlias } from "./alias.js"
|
||||
import { insertResponse, readResponse, writeResponse, singleResponse } from "./responses.js"
|
||||
//import { postgresHandler } from "./postgresHandler"
|
||||
import { checkConstraint, Constraint, Datatype, foreignConstraint, uniqueConstraint } from './dbStructure';
|
||||
import { Handler } from './defaultHandler';
|
||||
import { Query } from './query';
|
||||
import { attributeSettings, extendedAttributeSettings, onAction } from './types';
|
||||
|
||||
declare module "mariadb" {
|
||||
interface Pool{
|
||||
on(ev: 'error', callback: () => void): Pool;
|
||||
}
|
||||
}
|
||||
|
||||
export class DB {
|
||||
tables: Table[] = [];
|
||||
handler!: Handler;
|
||||
name!: string;
|
||||
type!: dbType;
|
||||
mariaPool!: mariadb.Pool;
|
||||
private connected = false;
|
||||
//pgPool!: pg.Pool;
|
||||
connect({ host, user, password, database, port = 3306, connectionLimit = 5, databaseType = dbType.mariadb }: { host: string, user: string, password: string, database: string, port?: number, connectionLimit?: number, databaseType?: dbType }) {
|
||||
this.connected = true;
|
||||
this.type = databaseType;
|
||||
if (databaseType == dbType.mariadb) {
|
||||
this.mariaPool = mariadb.createPool({ host, user, password, port, database, connectionLimit, multipleStatements: true });
|
||||
// catch errors
|
||||
this.mariaPool.on("error",()=>{});
|
||||
this.handler = new Handler(this);
|
||||
}
|
||||
/*else if (databaseType == dbType.postgres) {
|
||||
this.pgPool = new pg.Pool({ host, user, password, max: connectionLimit, database, idleTimeoutMillis: 30000, connectionTimeoutMillis: 2000 });
|
||||
this.handler = new postgresHandler(this);
|
||||
}*/
|
||||
else throw new Error("Unsuported Database type!");
|
||||
|
||||
handler: Handler;
|
||||
name: string;
|
||||
pool: mariadb.Pool;
|
||||
constructor({ host, user, password, database, connectionLimit = 5 }: { host: string, user: string, password: string, database: string, connectionLimit: number }) {
|
||||
this.pool = mariadb.createPool({ host, user, password, database, connectionLimit, multipleStatements: true });
|
||||
this.handler = new Handler();
|
||||
this.name = database;
|
||||
}
|
||||
async query(query: Query, printQuery = false) {
|
||||
if (!this.connected) throw new Error("Not connected yet!");
|
||||
if (printQuery) console.log(query);
|
||||
if (this.type == dbType.mariadb) return await this.mariaPool.query(query);
|
||||
/*else if (this.type == dbType.postgres) {
|
||||
let res = await this.pgPool.query(query.sql, query.values);
|
||||
console.log([...res.rows]);
|
||||
return res.rows;
|
||||
}*/
|
||||
else throw new Error("Invalid Database Type!");
|
||||
async query(query: Query) {
|
||||
//console.log(query);
|
||||
return await this.pool.query(query);
|
||||
}
|
||||
getHandler() {
|
||||
if (!this.connected) throw new Error("Not connected yet!");
|
||||
return this.handler;
|
||||
}
|
||||
|
||||
async sync(force = false) {
|
||||
if (!this.connected) throw new Error("Not connected yet!");
|
||||
let handler = this.getHandler();
|
||||
await handler.syncDB(this, handler, force);
|
||||
//this.tables.forEach(t=>{
|
||||
// console.log(handler.builders.query(handler.querys.create(handler,t)));
|
||||
//})
|
||||
}
|
||||
|
||||
newTable(name: string) {
|
||||
|
|
@ -71,22 +42,17 @@ export class DB {
|
|||
return null;
|
||||
}
|
||||
async close() {
|
||||
if (!this.connected) throw new Error("Not connected yet!");
|
||||
if (this.type == dbType.mariadb && this.mariaPool) await this.mariaPool.end();
|
||||
//if (this.type == dbType.postgres && this.pgPool) await this.pgPool.end();
|
||||
this.connected = false;
|
||||
if (this.pool) await this.pool.end();
|
||||
}
|
||||
}
|
||||
|
||||
export class Attribute {
|
||||
name: string;
|
||||
nameO: string;
|
||||
table: Table;
|
||||
ops: attributeSettings;
|
||||
type: Datatype;
|
||||
constructor(name: string, nameO: string, table: Table, type: Datatype, ops: attributeSettings) {
|
||||
constructor(name: string, table: Table, type: Datatype, ops: attributeSettings) {
|
||||
this.name = name.toLowerCase();
|
||||
this.nameO = nameO;
|
||||
this.type = type;
|
||||
this.table = table;
|
||||
this.ops = ops;
|
||||
|
|
@ -104,13 +70,13 @@ export class Attribute {
|
|||
[this]
|
||||
))
|
||||
}
|
||||
if (ops.foreignKey != null) {
|
||||
if (ops.foreginKey != null) {
|
||||
table.addConstraint(new foreignConstraint(
|
||||
table.dbLangDatabaseInstance.name + "_" + table.dbLangTableName + "_" + name + "_foreign_constraint_to_" + ops.foreignKey.link.name,
|
||||
table.dbLangDatabaseInstance.name + "_" + table.dbLangTableName + "_" + name + "_foreign_constraint_to_" + ops.foreginKey.link.name,
|
||||
[this],
|
||||
[ops.foreignKey.link],
|
||||
ops.foreignKey.onDelete,
|
||||
ops.foreignKey.onUpdate
|
||||
[ops.foreginKey.link],
|
||||
ops.foreginKey.onDelete,
|
||||
ops.foreginKey.onUpdate
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
@ -123,15 +89,12 @@ export class Attribute {
|
|||
serialize(handler: Handler) {
|
||||
return handler.builders.escapeID(this.name);
|
||||
}
|
||||
getString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
|
||||
toString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
|
||||
return this.table.serialize(handler) + "." + this.serialize(handler);
|
||||
}
|
||||
toStringFunc(handler: Handler) {
|
||||
return this.table.serialize(handler) + "(" + this.serialize(handler) + ")";
|
||||
}
|
||||
toString() {
|
||||
return this.table.dbLangTableName + "_" + this.name;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -154,9 +117,9 @@ export class Table {
|
|||
addAttribute(name: string, type: Datatype, ops: attributeSettings = {}, noErrorOnNameConflict = false) {
|
||||
let lowName = name.toLowerCase();
|
||||
if (this.dbLangTableAttributes[lowName] != null) throw new Error("You are tring to create an Attribute twise!");
|
||||
let attr = new Attribute(lowName, name, this, type, ops);
|
||||
let attr = new Attribute(lowName, this, type, ops);
|
||||
this.dbLangTableAttributes[lowName] = attr;
|
||||
if (["serialize", "toString", "addAttribute", "dbLangTableName", "dbLangTableAttributes", "dbLangDatabaseInstance", "addConstraint", "addAttributes", "createAlias"].includes(lowName)) {
|
||||
if (["serialize", "toString", "addAttribute", "dbLangTableName", "dbLangTableAttributes", "dbLangDatabaseInstance", "addConstraint", "addAttributes"].includes(lowName)) {
|
||||
if (!noErrorOnNameConflict) throw new Error("You cannot name Attribute like Methode of this Table!");
|
||||
} else {
|
||||
this[lowName] = attr;
|
||||
|
|
@ -170,16 +133,10 @@ export class Table {
|
|||
}));
|
||||
}
|
||||
addConstraint(c: Constraint) {
|
||||
let check = c.check(this);
|
||||
if(typeof check == "string") throw new Error(check);
|
||||
c.check(this);
|
||||
this.dbLangConstrains.push(c);
|
||||
}
|
||||
createAlias(name: string) {
|
||||
return new TableAlias(name, this);
|
||||
}
|
||||
}
|
||||
|
||||
export * from './funcs.js';
|
||||
export { onAction, order };
|
||||
export { dbType as databaseType }
|
||||
export { readResponse, writeResponse, insertResponse, singleResponse }
|
||||
export * from './funcs';
|
||||
export { onAction };
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
import { Attribute, Table } from "./db.js";
|
||||
import { Handler } from "./defaultHandler.js";
|
||||
import { QueryBuilder } from "./query.js";
|
||||
import { sha256 } from "./tools.js";
|
||||
import { allModifierInput, joinElements, joinType, onAction, primaryData, serializeReturn } from "./types.js";
|
||||
import { Attribute, Table } from "./db";
|
||||
import { Handler } from "./defaultHandler";
|
||||
import { QueryBuilder } from "./query";
|
||||
import { allModifierInput, onAction, primaryData, serializeReturn } from "./types";
|
||||
|
||||
export class Datatype {
|
||||
type: string;
|
||||
|
|
@ -43,66 +42,16 @@ export class Aggregation {
|
|||
return handler.aggregations[this.t as keyof typeof handler.aggregations](handler, this.a);
|
||||
}
|
||||
}
|
||||
export interface Joins {
|
||||
serialize(handler: Handler): QueryBuilder
|
||||
}
|
||||
export class joinNatural implements Joins{
|
||||
tables: joinElements[];
|
||||
type: joinType;
|
||||
constructor(tables:joinElements[], type: joinType){
|
||||
this.tables = tables;
|
||||
this.type = type;
|
||||
}
|
||||
export class Joins {
|
||||
|
||||
serialize(handler: Handler): QueryBuilder {
|
||||
return handler.joins.natural(handler,this);
|
||||
return new QueryBuilder();
|
||||
}
|
||||
|
||||
}
|
||||
export class onJoin implements Joins{
|
||||
tableA: joinElements;
|
||||
tableB: joinElements;
|
||||
type: joinType;
|
||||
on: BooleanModifier;
|
||||
constructor(tableA: joinElements, tableB: joinElements, type: joinType, on: BooleanModifier){
|
||||
this.tableA = tableA;
|
||||
this.tableB = tableB;
|
||||
this.type = type;
|
||||
this.on = on;
|
||||
}
|
||||
serialize(handler: Handler): QueryBuilder {
|
||||
return handler.joins.on(handler,this);
|
||||
}
|
||||
|
||||
}
|
||||
export class usingJoin implements Joins{
|
||||
tableA: joinElements;
|
||||
tableB: joinElements;
|
||||
type: joinType;
|
||||
using: Attribute[];
|
||||
constructor(tableA: joinElements, tableB: joinElements, type: joinType, using: Attribute[]){
|
||||
this.tableA = tableA;
|
||||
this.tableB = tableB;
|
||||
this.type = type;
|
||||
this.using = using;
|
||||
}
|
||||
serialize(handler: Handler): QueryBuilder {
|
||||
return handler.joins.using(handler,this);
|
||||
}
|
||||
|
||||
}
|
||||
export class joinCross implements Joins{
|
||||
tables: joinElements[];
|
||||
constructor(tables:joinElements[]){
|
||||
this.tables = tables;
|
||||
}
|
||||
serialize(handler: Handler): QueryBuilder {
|
||||
return handler.joins.cross(handler,this);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export interface Constraint {
|
||||
name: string;
|
||||
serialize(handler: Handler): QueryBuilder;
|
||||
uses(attr: Attribute): boolean;
|
||||
check(table: Table): boolean | string;
|
||||
}
|
||||
|
|
@ -111,7 +60,6 @@ export class checkConstraint implements Constraint {
|
|||
checkQuery: BooleanModifier;
|
||||
name: string;
|
||||
constructor(name: string, check: BooleanModifier) {
|
||||
if (name.length > 64) name = sha256(name);
|
||||
this.name = name.toLowerCase();
|
||||
this.checkQuery = check;
|
||||
}
|
||||
|
|
@ -121,28 +69,32 @@ export class checkConstraint implements Constraint {
|
|||
uses(attr: Attribute): boolean {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
serialize(handler: Handler): QueryBuilder {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
}
|
||||
|
||||
export class uniqueConstraint implements Constraint {
|
||||
name: string;
|
||||
attrs: Attribute[];
|
||||
constructor(name: string, attrs: Attribute[]) {
|
||||
if (name.length > 64) name = sha256(name);
|
||||
this.name = name.toLowerCase();
|
||||
this.attrs = attrs;
|
||||
}
|
||||
check(table: Table): boolean | string {
|
||||
let prim = true;
|
||||
for (let i = 0; i < this.attrs.length; i++) {
|
||||
if (!this.attrs[i].ops.primaryKey) prim = false;
|
||||
if (this.attrs[i].ops.primaryKey) return "Can not combine unique Constraint and primary key";
|
||||
if (this.attrs[i].table != table) return "Referencing Attributes must be in host Table.";
|
||||
}
|
||||
if (prim) return "Can not combine unique Constraint and primary key";
|
||||
return false;
|
||||
}
|
||||
uses(attr: Attribute): boolean {
|
||||
return this.attrs.includes(attr);
|
||||
}
|
||||
serialize(handler: Handler): QueryBuilder {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export class foreignConstraint implements Constraint {
|
||||
|
|
@ -152,13 +104,15 @@ export class foreignConstraint implements Constraint {
|
|||
onUpdate: onAction;
|
||||
onDelete: onAction;
|
||||
constructor(name: string, from: Attribute[], to: Attribute[], onDelete: onAction = onAction.nothing, onUpdate: onAction = onAction.nothing) {
|
||||
if (name.length > 64) name = sha256(name);
|
||||
this.name = name.toLowerCase();
|
||||
this.fromAttrs = from;
|
||||
this.toAttrs = to;
|
||||
this.onUpdate = onUpdate;
|
||||
this.onDelete = onDelete;
|
||||
}
|
||||
serialize(handler: Handler): QueryBuilder {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
uses(attr: Attribute): boolean {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
|
@ -166,7 +120,7 @@ export class foreignConstraint implements Constraint {
|
|||
let table = this.toAttrs[0].table;
|
||||
for (let i = 0; i < this.toAttrs.length; i++) {
|
||||
if (table != this.toAttrs[i].table) return "Referenced Attributes must be in one Table.";
|
||||
if (!this.toAttrs[i].ops.primaryKey) return "Can not reference non primary keys.";
|
||||
if (this.toAttrs[i].ops.primaryKey) return "Can not reference non primary keys.";
|
||||
}
|
||||
for (let i = 0; i < this.fromAttrs.length; i++) {
|
||||
if (this.fromAttrs[i].table != t) return "Referencing Attributes must be in host Table.";
|
||||
|
|
|
|||
|
|
@ -1,22 +1,27 @@
|
|||
import { Alias, AttributeAlias, TableAlias } from "./alias.js";
|
||||
import { Attribute, DB, insertResponse, readResponse, Table, writeResponse } from "./db.js"
|
||||
import { Aggregation, checkConstraint, joinCross, Datatype, foreignConstraint, Modifier, joinNatural, onJoin, uniqueConstraint, usingJoin } from "./dbStructure.js"
|
||||
import { insertQuery, Query, QueryBuilder, removeQuery, selectQuery, updateQuery } from "./query.js"
|
||||
import { allModifierInput, joinType, onAction, order, primaryData } from "./types.js"
|
||||
import { sha256 } from "./tools.js"
|
||||
import { Attribute, DB, Table } from "./db"
|
||||
import { Aggregation, checkConstraint, Constraint, Datatype, foreignConstraint, Modifier, uniqueConstraint } from "./dbStructure"
|
||||
import { insertQuery, Query, QueryBuilder, removeQuery, selectQuery, updateQuery } from "./query"
|
||||
import { allModifierInput, onAction, primaryData, serializeReturn } from "./types"
|
||||
|
||||
export class Handler {
|
||||
db: DB;
|
||||
constructor(db: DB) {
|
||||
this.db = db;
|
||||
}
|
||||
async syncDB(db: DB, handler: Handler, deleteInDB: boolean = false) {
|
||||
//Constraint Data
|
||||
let constraints = await db.query(handler.builders.query(handler.querys.listConstraints(handler, db)));
|
||||
let key = [...await db.query(handler.builders.query(handler.querys.listConstraintDetails(handler, db)))];
|
||||
console.log("start sync");
|
||||
|
||||
let gd = new QueryBuilder();
|
||||
gd.addCode(`SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE where CONSTRAINT_SCHEMA = `);
|
||||
gd.addInjection(db.name);
|
||||
gd.addCode(` or TABLE_SCHEMA = `);
|
||||
gd.addInjection(db.name);
|
||||
gd.addCode(`;select * from information_schema.table_constraints where CONSTRAINT_SCHEMA = `);
|
||||
gd.addInjection(db.name)
|
||||
gd.addCode(` or TABLE_SCHEMA = `);
|
||||
gd.addInjection(db.name);
|
||||
|
||||
let [key, constraints] = await db.query(handler.builders.query(gd));
|
||||
|
||||
//Table List
|
||||
let allTables = (await db.query(handler.builders.query(handler.querys.listTables(handler, db)))).map((d: any) => d.TABLE_NAME ?? d.table_name);
|
||||
let allTables = (await db.query(handler.builders.query(handler.querys.listTables(handler, db)))).map((d: any) => d.TABLE_NAME);
|
||||
|
||||
// gether Table Schematics
|
||||
let tableData: { [key: string]: any; } = {};
|
||||
for (let i = 0; i < db.tables.length; i++) {
|
||||
|
|
@ -25,16 +30,15 @@ export class Handler {
|
|||
const tableDataBuilder = new QueryBuilder();
|
||||
tableDataBuilder.addCode("DESCRIBE ");
|
||||
tableDataBuilder.addCode(table.serialize(handler));
|
||||
tableData[table.dbLangTableName] =
|
||||
tableData[table.dbLangTableName.toLowerCase()] =
|
||||
Object.fromEntries((await db.query(handler.builders.query(tableDataBuilder))).map((d: any) => [d.Field.toLowerCase(), d]));
|
||||
} catch (_) {
|
||||
tableData[table.dbLangTableName] = null;
|
||||
tableData[table.dbLangTableName.toLowerCase()] = null;
|
||||
}
|
||||
}
|
||||
|
||||
const del = new QueryBuilder();
|
||||
const create = new QueryBuilder();
|
||||
const connst = new QueryBuilder();
|
||||
|
||||
function checkUniqueIsVaild(n: string, table: string) {
|
||||
let t = db.getTable(table);
|
||||
|
|
@ -46,10 +50,10 @@ export class Handler {
|
|||
let found = 0;
|
||||
for (let j = 0; j < key.length; j++) {
|
||||
if (
|
||||
(key[j].CONSTRAINT_NAME ?? key[j].constraint_name) == n
|
||||
&& (key[j].TABLE_NAME ?? key[j].table_name) == table
|
||||
key[j].CONSTRAINT_NAME == n
|
||||
&& key[j].TABLE_NAME == table
|
||||
) {
|
||||
if (attrs.includes((key[j].COLUMN_NAME ?? key[j].column_name).toLowerCase())) found++;
|
||||
if (attrs.includes(key[j].COLUMN_NAME.toLowerCase())) found++;
|
||||
else return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -71,12 +75,12 @@ export class Handler {
|
|||
let found = 0;
|
||||
for (let j = 0; j < key.length; j++) {
|
||||
if (
|
||||
(key[j].CONSTRAINT_NAME ?? key[j].constraint_name) == n
|
||||
&& (key[j].TABLE_NAME ?? key[j].table_name) == table
|
||||
&& (key[j].REFERENCED_TABLE_NAME ?? key[j].referenced_table_name) == refTable
|
||||
key[j].CONSTRAINT_NAME == n
|
||||
&& key[j].TABLE_NAME == table
|
||||
&& key[j].REFERENCED_TABLE_NAME == refTable
|
||||
) {
|
||||
let inF = fromAttrs.indexOf((key[j].COLUMN_NAME ?? key[j].column_name).toLowerCase());
|
||||
let inT = toAttrs.indexOf((key[j].REFERENCED_COLUMN_NAME ?? key[j].referenced_column_name).toLowerCase());
|
||||
let inF = fromAttrs.indexOf(key[j].COLUMN_NAME.toLowerCase());
|
||||
let inT = toAttrs.indexOf(key[j].REFERENCED_COLUMN_NAME.toLowerCase());
|
||||
if (inF != -1 && inT == inF) found++;
|
||||
else return false;
|
||||
}
|
||||
|
|
@ -92,10 +96,10 @@ export class Handler {
|
|||
let found = 0;
|
||||
for (let j = 0; j < key.length; j++) {
|
||||
if (
|
||||
(key[j].CONSTRAINT_NAME ?? key[j].constraint_name).toLowerCase() == c.name
|
||||
&& (key[j].TABLE_NAME ?? key[j].table_name) == tabel.dbLangTableName
|
||||
key[j].CONSTRAINT_NAME.toLowerCase() == c.name
|
||||
&& key[j].TABLE_NAME == tabel.dbLangTableName
|
||||
) {
|
||||
if (attrs.includes((key[j].COLUMN_NAME ?? key[j].column_name).toLowerCase())) found++;
|
||||
if (attrs.includes(key[j].COLUMN_NAME.toLowerCase())) found++;
|
||||
else return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -108,12 +112,12 @@ export class Handler {
|
|||
let found = 0;
|
||||
for (let j = 0; j < key.length; j++) {
|
||||
if (
|
||||
(key[j].CONSTRAINT_NAME ?? key[j].constraint_name) == c.name
|
||||
&& (key[j].TABLE_NAME ?? key[j].table_name) == tabel.dbLangTableName
|
||||
&& (key[j].REFERENCED_TABLE_NAME ?? key[j].referenced_table_name) == refTable
|
||||
key[j].CONSTRAINT_NAME == c.name
|
||||
&& key[j].TABLE_NAME == tabel.dbLangTableName
|
||||
&& key[j].REFERENCED_TABLE_NAME == refTable
|
||||
) {
|
||||
let inF = fromAttrs.indexOf((key[j].COLUMN_NAME ?? key[j].column_name).toLowerCase());
|
||||
let inT = toAttrs.indexOf((key[j].REFERENCED_COLUMN_NAME ?? key[j].referenced_column_name).toLowerCase());
|
||||
let inF = fromAttrs.indexOf(key[j].COLUMN_NAME.toLowerCase());
|
||||
let inT = toAttrs.indexOf(key[j].REFERENCED_COLUMN_NAME.toLowerCase());
|
||||
if (inF != -1 && inT == inF) found++;
|
||||
else return false;
|
||||
}
|
||||
|
|
@ -121,59 +125,44 @@ export class Handler {
|
|||
return found == fromAttrs.length && found == toAttrs.length;
|
||||
}
|
||||
|
||||
function freeForUpdate(attr: string, table: string, start = false, pool = del) {
|
||||
for (let i = 0; i < key.length; i++) {
|
||||
const k = key[i];
|
||||
if (
|
||||
((k.REFERENCED_TABLE_NAME ?? k.referenced_table_name) == table
|
||||
&& (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name).toLowerCase() == attr.toLowerCase())
|
||||
|| (start && (k.TABLE_NAME ?? k.table_name) == table
|
||||
&& (k.COLUMN_NAME ?? k.column_name).toLowerCase() == attr.toLowerCase() && (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name) != null)
|
||||
) {
|
||||
pool.appendEnding(handler.querys.removeForeignKey(handler, (k.TABLE_NAME ?? k.table_name), (k.CONSTRAINT_NAME ?? k.constraint_name)));
|
||||
key.splice(i--, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//delete check and unused/false(unique, foreign) constraints
|
||||
for (let i = 0; i < constraints.length; i++) {
|
||||
const c = constraints[i];
|
||||
if ((c.CONSTRAINT_TYPE ?? c.constraint_type) == "CHECK") {
|
||||
del.appendEnding(handler.querys.removeCheck(handler, (c.TABLE_NAME ?? c.table_name), (c.CONSTRAINT_NAME ?? c.constraint_name)));
|
||||
} else if ((c.CONSTRAINT_TYPE ?? c.constraint_type) == "UNIQUE") {
|
||||
if (c.CONSTRAINT_TYPE == "CHECK") {
|
||||
del.appendEnding(handler.querys.removeCheck(handler, c.TABLE_NAME, c.CONSTRAINT_NAME));
|
||||
} else if (c.CONSTRAINT_TYPE == "UNIQUE") {
|
||||
if (
|
||||
(typeof tableData[c.TABLE_NAME ?? c.table_name] == "undefined" && deleteInDB)
|
||||
|| !checkUniqueIsVaild((c.CONSTRAINT_NAME ?? c.constraint_name), (c.TABLE_NAME ?? c.table_name))
|
||||
) {
|
||||
const uTName = (c.TABLE_NAME ?? c.table_name);
|
||||
const uCName = (c.CONSTRAINT_NAME ?? c.constraint_name);
|
||||
for (let j = 0; j < key.length; j++) {
|
||||
if (
|
||||
(key[j].CONSTRAINT_NAME ?? key[j].constraint_name) == uCName
|
||||
&& (key[j].TABLE_NAME ?? key[j].table_name) == uTName
|
||||
) {
|
||||
freeForUpdate((key[j].COLUMN_NAME ?? key[j].column_name), uTName, true);
|
||||
}
|
||||
}
|
||||
del.appendEnding(handler.querys.removeUnique(handler, uTName, uCName));
|
||||
}
|
||||
} else if ((c.CONSTRAINT_TYPE ?? c.constraint_type) == "FOREIGN KEY") {
|
||||
(typeof tableData[c.TABLE_NAME.toLowerCase()] == "undefined" && deleteInDB)
|
||||
|| !checkUniqueIsVaild(c.CONSTRAINT_NAME, c.TABLE_NAME)
|
||||
) del.appendEnding(handler.querys.removeUnique(handler, c.TABLE_NAME, c.CONSTRAINT_NAME));
|
||||
} else if (c.CONSTRAINT_TYPE == "FOREIGN KEY") {
|
||||
if (
|
||||
(typeof tableData[c.TABLE_NAME ?? c.table_name] == "undefined" && deleteInDB)
|
||||
|| !checkForeignIsVaild((c.CONSTRAINT_NAME ?? c.constraint_name), (c.TABLE_NAME ?? c.table_name))
|
||||
) del.appendEnding(handler.querys.removeForeignKey(handler, (c.TABLE_NAME ?? c.table_name), (c.CONSTRAINT_NAME ?? c.constraint_name)));
|
||||
(typeof tableData[c.TABLE_NAME.toLowerCase()] == "undefined" && deleteInDB)
|
||||
|| !checkForeignIsVaild(c.CONSTRAINT_NAME, c.TABLE_NAME)
|
||||
) del.appendEnding(handler.querys.removeForeignKey(handler, c.TABLE_NAME, c.CONSTRAINT_NAME));
|
||||
}
|
||||
}
|
||||
//delete unused Tables
|
||||
if (deleteInDB) for (let i = 0; i < allTables.length; i++) {
|
||||
if (typeof tableData[allTables[i]] == "undefined") del.appendEnding(handler.querys.deleteTable(handler, allTables[i]));
|
||||
if (typeof tableData[allTables[i].toLowerCase()] == "undefined") del.appendEnding(handler.querys.deleteTable(handler, allTables[i]));
|
||||
}
|
||||
|
||||
function freeForUpdate(attr: string, table: string) {
|
||||
for (let i = 0; i < key.length; i++) {
|
||||
const k = key[i];
|
||||
if (
|
||||
k.REFERENCED_TABLE_NAME == table
|
||||
&& k.REFERENCED_COLUMN_NAME.toLowerCase() == attr.toLowerCase()
|
||||
) {
|
||||
del.appendEnding(handler.querys.removeForeignKey(handler, k.TABLE_NAME, k.CONSTRAINT_NAME));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//create tables
|
||||
for (let i = 0; i < db.tables.length; i++) {
|
||||
const table = db.tables[i];
|
||||
const tableD = tableData[table.dbLangTableName];
|
||||
const tableD = tableData[table.dbLangTableName.toLowerCase()];
|
||||
//delete unused Columns
|
||||
if (deleteInDB && tableD != null) {
|
||||
let keys = Object.keys(tableD);
|
||||
|
|
@ -188,78 +177,58 @@ export class Handler {
|
|||
let changePrimary = false;
|
||||
if (tableD == null) {
|
||||
create.appendEnding(handler.querys.create(handler, table));
|
||||
//changePrimary = true;
|
||||
changePrimary = true;
|
||||
} else {
|
||||
let keys = Object.keys(table.dbLangTableAttributes);
|
||||
for (let j = 0; j < keys.length; j++) {
|
||||
const a = table.dbLangTableAttributes[keys[j]];
|
||||
const attrData = tableD[keys[j]];
|
||||
if (attrData == null) {
|
||||
if (a.ops.autoIncrement) {
|
||||
a.ops.autoIncrement = false;
|
||||
create.appendEnding(handler.querys.addColumn(handler, a));
|
||||
a.ops.autoIncrement = true;
|
||||
connst.appendEnding(handler.querys.addColumn(handler, a));
|
||||
}
|
||||
else create.appendEnding(handler.querys.addColumn(handler, a));
|
||||
if (a.ops.primaryKey) changePrimary = true;
|
||||
create.appendEnding(handler.querys.addColumn(handler, a));
|
||||
changePrimary = true;
|
||||
} else if (
|
||||
!handler.builders.compareDatatypes(handler, a.type, attrData.Type) ||
|
||||
a.ops.default != attrData.Default ||
|
||||
(!!a.ops.notNull || !!a.ops.autoIncrement || !!a.ops.primaryKey) != (attrData.Null == "NO") ||
|
||||
(!!a.ops.autoIncrement) != (attrData.Extra == "auto_increment")
|
||||
) {
|
||||
/*console.log(!handler.builders.compareDatatypes(handler, a.type, attrData.Type), "|",
|
||||
a.ops.default, attrData.Default, "|",
|
||||
(!!a.ops.notNull || !!a.ops.autoIncrement || !!a.ops.primaryKey), (attrData.Null == "NO"), "|",
|
||||
(!!a.ops.autoIncrement), (attrData.Extra == "auto_increment"));*/
|
||||
freeForUpdate(a.name, a.table.dbLangTableName);
|
||||
if (a.ops.autoIncrement) {
|
||||
a.ops.autoIncrement = false;
|
||||
create.appendEnding(handler.querys.changeColumn(handler, a));
|
||||
a.ops.autoIncrement = true;
|
||||
connst.appendEnding(handler.querys.changeColumn(handler, a));
|
||||
}
|
||||
else create.appendEnding(handler.querys.changeColumn(handler, a));
|
||||
create.appendEnding(handler.querys.changeColumn(handler, a));
|
||||
}
|
||||
if (attrData != null) {
|
||||
if (attrData == null) {
|
||||
changePrimary = true;
|
||||
} else {
|
||||
if ((attrData.Key == "PRI") != (!!a.ops.primaryKey)) {
|
||||
freeForUpdate(a.name, a.table.dbLangTableName);
|
||||
changePrimary = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (changePrimary) for (let j = 0; j < keys.length; j++) {
|
||||
const a = table.dbLangTableAttributes[keys[j]];
|
||||
if (a.ops.autoIncrement) {
|
||||
a.ops.autoIncrement = false;
|
||||
create.appendEnding(handler.querys.changeColumn(handler, a));
|
||||
a.ops.autoIncrement = true;
|
||||
connst.appendEnding(handler.querys.changeColumn(handler, a));
|
||||
}
|
||||
freeForUpdate(a.name, a.table.dbLangTableName, true, create);
|
||||
}
|
||||
}
|
||||
if (changePrimary) {
|
||||
create.appendEnding(handler.querys.removePrimaryKey(handler, table.dbLangTableName));
|
||||
create.appendEnding(handler.querys.addPrimaryKey(handler, table));
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < db.tables.length; i++) {
|
||||
const table = db.tables[i];
|
||||
for (let j = 0; j < table.dbLangConstrains.length; j++) {
|
||||
const c = table.dbLangConstrains[j];
|
||||
if (c instanceof checkConstraint) {
|
||||
connst.appendEnding(handler.querys.addCheck(handler, table, c));
|
||||
create.appendEnding(handler.querys.addCheck(handler, table, c));
|
||||
} else if (c instanceof uniqueConstraint) {
|
||||
if (!checkUniqueExists(table, c)) {
|
||||
connst.appendEnding(handler.querys.addUnique(handler, table, c));
|
||||
create.appendEnding(handler.querys.addUnique(handler, table, c));
|
||||
}
|
||||
} else if (c instanceof foreignConstraint) {
|
||||
if (!checkForeignExists(table, c)) {
|
||||
connst.appendEnding(handler.querys.addForeignKey(handler, table, c));
|
||||
create.appendEnding(handler.querys.addForeignKey(handler, table, c));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!create.isEmpty()) del.append(create);
|
||||
if (!connst.isEmpty()) del.append(connst);
|
||||
if (!del.isEmpty()) await db.query(handler.builders.query(del));
|
||||
}
|
||||
|
||||
|
|
@ -267,34 +236,8 @@ export class Handler {
|
|||
select: (handler: Handler, q: selectQuery): QueryBuilder => {
|
||||
const builder = new QueryBuilder();
|
||||
builder.addCode("select ");
|
||||
let a = q.attr;
|
||||
for (let i = 0; i < a.length; i++) {
|
||||
const d = a[i];
|
||||
if (d instanceof Attribute || d instanceof AttributeAlias)
|
||||
builder.addCode(d.getString(handler) + " " + handler.builders.escapeID(d.toString()));
|
||||
else if (d instanceof Alias) {
|
||||
builder.append(d.serialize(handler));
|
||||
builder.addCode(handler.builders.escapeID(d.toString()));
|
||||
} else if (d instanceof Modifier || d instanceof selectQuery || d instanceof Aggregation) {
|
||||
builder.addCode("(");
|
||||
builder.append(d.serialize(handler));
|
||||
builder.addCode(")");
|
||||
} else {
|
||||
builder.addInjection(d);
|
||||
}
|
||||
if (i + 1 < a.length) builder.addCode(", ");
|
||||
}
|
||||
//builder.append(joinArg(", ")(handler, q.attr));
|
||||
builder.addCode(` from `);
|
||||
if (q.from == null) {
|
||||
builder.addCode(" DUAL");
|
||||
} else if (q.from instanceof Table) {
|
||||
builder.addCode(q.from.serialize(handler));
|
||||
} else if (q.from instanceof TableAlias) {
|
||||
builder.addCode(q.from.serializeAlias(handler));
|
||||
} else {
|
||||
builder.append(q.from.serialize(handler));
|
||||
}
|
||||
builder.append(joinArg(", ")(handler, q.attr));
|
||||
builder.addCode(` from ${q.from == null ? 'DUAL' : q.from.serialize(handler)}`);
|
||||
if (q.whereD) {
|
||||
builder.addCode(" where ");
|
||||
builder.append(q.whereD.serialize(handler));
|
||||
|
|
@ -307,35 +250,9 @@ export class Handler {
|
|||
builder.append(q.havingD.serialize(handler));
|
||||
}
|
||||
}
|
||||
if (q.orderByD.length > 0) {
|
||||
builder.addCode(" order by ");
|
||||
for (let i = 0; i < q.orderByD.length; i++) {
|
||||
const d = q.orderByD[i];
|
||||
if (d[0] instanceof Attribute || d[0] instanceof AttributeAlias) builder.addCode(d[0].getString(handler));
|
||||
else if (d[0] instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(d.toString()));
|
||||
else if (d[0] instanceof Modifier || d[0] instanceof selectQuery || d[0] instanceof Aggregation) {
|
||||
builder.addCode("(");
|
||||
builder.append(d[0].serialize(handler));
|
||||
builder.addCode(")");
|
||||
} else {
|
||||
builder.addInjection(d[0]);
|
||||
}
|
||||
if(d[1] == order.DESC) builder.addCode(" DESC");
|
||||
else builder.addCode(" ASC");
|
||||
if (i + 1 < q.orderByD.length) builder.addCode(", ");
|
||||
}
|
||||
}
|
||||
if (q.limitD != null) {
|
||||
if (q.limitOffsetD == null) {
|
||||
builder.addCode(" limit ");
|
||||
builder.addInjection(q.limitD);
|
||||
} else {
|
||||
builder.addCode(" limit ");
|
||||
builder.addInjection(q.limitOffsetD);
|
||||
builder.addCode(", ");
|
||||
builder.addInjection(q.limitD);
|
||||
}
|
||||
if (q.havingD) {
|
||||
builder.addCode(" limit ");
|
||||
builder.addInjection(q.limitD);
|
||||
}
|
||||
|
||||
/*builder.setHandler((json)=>{
|
||||
|
|
@ -346,7 +263,7 @@ export class Handler {
|
|||
},
|
||||
insert: (hander: Handler, q: insertQuery): QueryBuilder => {
|
||||
const qb = new QueryBuilder();
|
||||
qb.addCode("INSERT IGNORE INTO ");
|
||||
qb.addCode("INSERT INTO ");
|
||||
qb.addCode(q.attrs[0].table.serialize(hander));
|
||||
qb.addCode("(");
|
||||
qb.addCodeCommaSeperated(q.attrs.map(a => a.serialize(hander)));
|
||||
|
|
@ -373,9 +290,7 @@ export class Handler {
|
|||
const s = q.setD[i];
|
||||
qb.addCode(s[0].serialize(handler));
|
||||
qb.addCode(" = (");
|
||||
if (s[1] instanceof Attribute || s[1] instanceof AttributeAlias) qb.addCode(s[1].serialize(handler));
|
||||
else if (s[1] instanceof Alias)
|
||||
qb.addCode(handler.builders.escapeID(s[1].toString()));
|
||||
if (s[1] instanceof Attribute) qb.addCode(s[1].serialize(handler));
|
||||
else if (s[1] instanceof Modifier || s[1] instanceof selectQuery || s[1] instanceof Aggregation) {
|
||||
qb.append(s[1].serialize(handler));
|
||||
} else {
|
||||
|
|
@ -390,7 +305,7 @@ export class Handler {
|
|||
}
|
||||
return qb;
|
||||
},
|
||||
remove: (handler: Handler, q: removeQuery): QueryBuilder => {
|
||||
remove: (handler: Handler, q: removeQuery): QueryBuilder =>{
|
||||
const qb = new QueryBuilder();
|
||||
qb.addCode("DELETE FROM ");
|
||||
qb.addCode(q.table.serialize(handler));
|
||||
|
|
@ -404,24 +319,7 @@ export class Handler {
|
|||
const qb = new QueryBuilder();
|
||||
qb.addCode(`SELECT * FROM information_schema.tables where TABLE_SCHEMA = `);
|
||||
qb.addInjection(db.name);
|
||||
qb.addCode(` and TABLE_TYPE = `);
|
||||
qb.addInjection("BASE TABLE");
|
||||
return qb;
|
||||
},
|
||||
listConstraints: (handler: Handler, db: DB) => {
|
||||
let qb = new QueryBuilder();
|
||||
qb.addCode(`select * from information_schema.table_constraints where CONSTRAINT_SCHEMA = `);
|
||||
qb.addInjection(db.name);
|
||||
qb.addCode(` or TABLE_SCHEMA = `);
|
||||
qb.addInjection(db.name);
|
||||
return qb;
|
||||
},
|
||||
listConstraintDetails: (handler: Handler, db: DB) => {
|
||||
let qb = new QueryBuilder();
|
||||
qb.addCode(`SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE where CONSTRAINT_SCHEMA = `);
|
||||
qb.addInjection(db.name);
|
||||
qb.addCode(` or TABLE_SCHEMA = `);
|
||||
qb.addInjection(db.name);
|
||||
qb.addCode(` and TABLE_TYPE = "BASE TABLE"`);
|
||||
return qb;
|
||||
},
|
||||
create: (handler: Handler, table: Table): QueryBuilder => {
|
||||
|
|
@ -434,15 +332,6 @@ export class Handler {
|
|||
builder.append(a.serializeSettings(handler));
|
||||
if (i + 1 < keys.length) builder.addCode(", ");
|
||||
}
|
||||
let primAttr = Object.entries(table.dbLangTableAttributes)
|
||||
.filter(([n, attr]) => !!attr.ops.primaryKey);
|
||||
if (primAttr.length > 0) {
|
||||
builder.addCode(", primary key (");
|
||||
builder.addCodeCommaSeperated(
|
||||
primAttr.map(([n, attr]) => handler.builders.escapeID(n))
|
||||
);
|
||||
builder.addCode(")");
|
||||
}
|
||||
builder.addCode(")");
|
||||
return builder;
|
||||
},
|
||||
|
|
@ -519,15 +408,14 @@ export class Handler {
|
|||
return builder;
|
||||
},
|
||||
addPrimaryKey: (handler: Handler, table: Table) => {
|
||||
let primaAttr = Object.entries(table.dbLangTableAttributes)
|
||||
.filter(([n, attr]) => !!attr.ops.primaryKey);
|
||||
const qb = new QueryBuilder();
|
||||
if (primaAttr.length == 0) return qb;
|
||||
qb.addCode("ALTER TABLE ");
|
||||
qb.addCode(table.serialize(handler));
|
||||
qb.addCode(" add PRIMARY KEY if not exists (");
|
||||
qb.addCodeCommaSeperated(
|
||||
primaAttr.map(([n, attr]) => handler.builders.escapeID(n))
|
||||
Object.entries(table.dbLangTableAttributes)
|
||||
.filter(([n, attr]) => !!attr.ops.primaryKey)
|
||||
.map(([n, attr]) => handler.builders.escapeID(n))
|
||||
);
|
||||
qb.addCode(")");
|
||||
return qb;
|
||||
|
|
@ -616,128 +504,27 @@ export class Handler {
|
|||
},
|
||||
escapeID: (key: string): string => {
|
||||
if (!key || key === "" || key.includes('\u0000')) throw new Error("Can not escape empty key or with null unicode!");
|
||||
if (key.length > 64) key = sha256(key);
|
||||
if (key.match(/^`.+`$/g)) return key;
|
||||
return `\`${key.replace(/`/g, '``')}\``;
|
||||
},
|
||||
escapeLiteral: (data: any): string => {
|
||||
return this.db.mariaPool.escape(data);
|
||||
},
|
||||
compareDatatypes: (handler: Handler, attr: Datatype, curr: String) => {
|
||||
let qb = attr.serialize(handler);
|
||||
let sql = "";
|
||||
for (let i = 0; i < qb.list.length; i++) {
|
||||
const [inject, data] = qb.list[i];
|
||||
if (inject) sql += handler.builders.escapeLiteral(data);
|
||||
else sql += data;
|
||||
sql += data;
|
||||
}
|
||||
return curr.split(", ").join(",").startsWith(sql.split(", ").join(","));
|
||||
},
|
||||
}
|
||||
|
||||
responses = {
|
||||
readResponse: (resp: any) => new readResponse(resp),
|
||||
writeResponse: (resp: any) => new writeResponse(resp.affectedRows),
|
||||
insertResponse: (resp: any) => new insertResponse(resp.affectedRows, resp.insertId),
|
||||
return curr.split(" ").join("").startsWith(sql.split(" ").join(""));
|
||||
},
|
||||
}
|
||||
|
||||
aggregations = {
|
||||
count: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "count(" + a.getString(handler) + ")" }]),
|
||||
sum: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "sum(" + a.getString(handler) + ")" }]),
|
||||
avg: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "avg(" + a.getString(handler) + ")" }]),
|
||||
min: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "min(" + a.getString(handler) + ")" }]),
|
||||
max: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "max(" + a.getString(handler) + ")" }]),
|
||||
}
|
||||
|
||||
joins = {
|
||||
natural: (handler: Handler, j: joinNatural) => {
|
||||
const qb = new QueryBuilder();
|
||||
for (let i = 0; i < j.tables.length; i++) {
|
||||
const t = j.tables[i];
|
||||
if (t instanceof Table) qb.addCode(t.serialize(handler));
|
||||
else if (t instanceof TableAlias) qb.addCode(t.serializeAlias(handler));
|
||||
else {
|
||||
qb.addCode("(");
|
||||
qb.append(t.serialize(handler));
|
||||
qb.addCode(")");
|
||||
}
|
||||
if (i + 1 < j.tables.length) {
|
||||
qb.addCode(" natural ");
|
||||
if (j.type == joinType.left) qb.addCode("left");
|
||||
if (j.type == joinType.right) qb.addCode("right");
|
||||
if (j.type == joinType.full) qb.addCode("full");
|
||||
qb.addCode(" join ");
|
||||
}
|
||||
}
|
||||
return qb;
|
||||
},
|
||||
using: (handler: Handler, j: usingJoin) => {
|
||||
const qb = new QueryBuilder();
|
||||
if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
|
||||
else if (j.tableA instanceof TableAlias) qb.addCode(j.tableA.serializeAlias(handler));
|
||||
else {
|
||||
qb.addCode("(");
|
||||
qb.append(j.tableA.serialize(handler));
|
||||
qb.addCode(")");
|
||||
}
|
||||
qb.addCode(" ");
|
||||
if (j.type == joinType.left) qb.addCode("left ");
|
||||
if (j.type == joinType.right) qb.addCode("right ");
|
||||
if (j.type == joinType.full) qb.addCode("full ");
|
||||
qb.addCode("join ");
|
||||
if (j.tableB instanceof Table) qb.addCode(j.tableB.serialize(handler));
|
||||
else if (j.tableB instanceof TableAlias) qb.addCode(j.tableB.serializeAlias(handler));
|
||||
else {
|
||||
qb.addCode("(");
|
||||
qb.append(j.tableB.serialize(handler));
|
||||
qb.addCode(")");
|
||||
}
|
||||
qb.addCode(" using (");
|
||||
qb.addCodeCommaSeperated(j.using.map(t => t.serialize(handler)));
|
||||
qb.addCode(")");
|
||||
return qb;
|
||||
},
|
||||
on: (handler: Handler, j: onJoin) => {
|
||||
const qb = new QueryBuilder();
|
||||
if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
|
||||
else if (j.tableA instanceof TableAlias) qb.addCode(j.tableA.serializeAlias(handler));
|
||||
else {
|
||||
qb.addCode("(");
|
||||
qb.append(j.tableA.serialize(handler));
|
||||
qb.addCode(")");
|
||||
}
|
||||
qb.addCode(" ");
|
||||
if (j.type == joinType.left) qb.addCode("left ");
|
||||
if (j.type == joinType.right) qb.addCode("right ");
|
||||
if (j.type == joinType.full) qb.addCode("full ");
|
||||
qb.addCode("join ");
|
||||
if (j.tableB instanceof Table) qb.addCode(j.tableB.serialize(handler));
|
||||
else if (j.tableB instanceof TableAlias) qb.addCode(j.tableB.serializeAlias(handler));
|
||||
else {
|
||||
qb.addCode("(");
|
||||
qb.append(j.tableB.serialize(handler));
|
||||
qb.addCode(")");
|
||||
}
|
||||
qb.addCode(" on (");
|
||||
qb.append(j.on.serialize(handler));
|
||||
qb.addCode(")");
|
||||
return qb;
|
||||
},
|
||||
cross: (handler: Handler, j: joinCross) => {
|
||||
const qb = new QueryBuilder();
|
||||
for (let i = 0; i < j.tables.length; i++) {
|
||||
const t = j.tables[i];
|
||||
if (t instanceof Table) qb.addCode(t.serialize(handler));
|
||||
else if (t instanceof TableAlias) qb.addCode(t.serializeAlias(handler));
|
||||
else {
|
||||
qb.addCode("(");
|
||||
qb.append(t.serialize(handler));
|
||||
qb.addCode(")");
|
||||
}
|
||||
if (i + 1 < j.tables.length) qb.addCode(" cross join ");
|
||||
}
|
||||
return qb;
|
||||
}
|
||||
count: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "count(" + a.toString(handler) + ")" }]),
|
||||
sum: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "sum(" + a.toString(handler) + ")" }]),
|
||||
avg: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "avg(" + a.toString(handler) + ")" }]),
|
||||
min: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "min(" + a.toString(handler) + ")" }]),
|
||||
max: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "max(" + a.toString(handler) + ")" }]),
|
||||
}
|
||||
|
||||
modifiers = {
|
||||
|
|
@ -754,9 +541,7 @@ export class Handler {
|
|||
divide: joinArg("-/"),
|
||||
not: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
|
||||
let e = a[0];
|
||||
if (e instanceof Attribute || e instanceof AttributeAlias) return new QueryBuilder([{ data: "not (" + e.getString(handler) + ")" }])
|
||||
if (e instanceof Alias)
|
||||
return new QueryBuilder([{ data: handler.builders.escapeID(e.toString()) }]);
|
||||
if (e instanceof Attribute) return new QueryBuilder([{ data: "not (" + e.toString(handler) + ")" }])
|
||||
if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
|
||||
const builder = new QueryBuilder();
|
||||
builder.addCode("not (");
|
||||
|
|
@ -772,18 +557,14 @@ export class Handler {
|
|||
},
|
||||
like: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
|
||||
const builder = new QueryBuilder();
|
||||
if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(a[0].getString());
|
||||
else if (a[0] instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(a[0].toString()));
|
||||
if (a[0] instanceof Attribute) builder.addCode(a[0].toString());
|
||||
else if (a[0] instanceof Modifier || a[0] instanceof selectQuery || a[0] instanceof Aggregation) {
|
||||
builder.append(a[0].serialize(handler));
|
||||
} else {
|
||||
builder.addInjection(a[0]);
|
||||
}
|
||||
builder.addCode(" LIKE ");
|
||||
if (a[1] instanceof Attribute || a[1] instanceof AttributeAlias) builder.addCode(a[1].getString());
|
||||
else if (a[1] instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(a[1].toString()));
|
||||
if (a[1] instanceof Attribute) builder.addCode(a[1].toString());
|
||||
else if (a[1] instanceof Modifier || a[1] instanceof selectQuery || a[1] instanceof Aggregation) {
|
||||
builder.append(a[1].serialize(handler));
|
||||
} else {
|
||||
|
|
@ -791,53 +572,12 @@ export class Handler {
|
|||
}
|
||||
return builder;
|
||||
},
|
||||
regexp: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
|
||||
const builder = new QueryBuilder();
|
||||
if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(a[0].getString());
|
||||
else if (a[0] instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(a[0].toString()));
|
||||
else if (a[0] instanceof Modifier || a[0] instanceof selectQuery || a[0] instanceof Aggregation) {
|
||||
builder.append(a[0].serialize(handler));
|
||||
} else {
|
||||
builder.addInjection(a[0]);
|
||||
}
|
||||
builder.addCode(" REGEXP ");
|
||||
if (a[1] instanceof Attribute || a[1] instanceof AttributeAlias) builder.addCode(a[1].getString());
|
||||
else if (a[1] instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(a[1].toString()));
|
||||
else if (a[1] instanceof Modifier || a[1] instanceof selectQuery || a[1] instanceof Aggregation) {
|
||||
builder.append(a[1].serialize(handler));
|
||||
} else {
|
||||
builder.addInjection(a[1]);
|
||||
}
|
||||
return builder;
|
||||
},
|
||||
exists: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
|
||||
let e = a[0];
|
||||
if (e instanceof Attribute || e instanceof AttributeAlias) return new QueryBuilder([{ data: "exists (" + e.getString(handler) + ")" }])
|
||||
if (e instanceof Alias)
|
||||
return new QueryBuilder([{ data: handler.builders.escapeID(e.toString()) }]);
|
||||
if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
|
||||
const builder = new QueryBuilder();
|
||||
builder.addCode("exists (");
|
||||
builder.append(e.serialize(handler));
|
||||
builder.addCode(")");
|
||||
return builder;
|
||||
}
|
||||
return new QueryBuilder([
|
||||
{ data: "exists (" },
|
||||
{ inject: true, data: e },
|
||||
{ data: ")" }
|
||||
]);
|
||||
},
|
||||
concat: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
|
||||
const builder = new QueryBuilder();
|
||||
builder.addCode("CONCAT(");
|
||||
for (let i = 0; i < a.length; i++) {
|
||||
const e = a[i];
|
||||
if (e instanceof Attribute || e instanceof AttributeAlias) builder.addCode(e.getString());
|
||||
else if (e instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(e.toString()));
|
||||
if (e instanceof Attribute) builder.addCode(e.toString());
|
||||
else if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
|
||||
builder.append(e.serialize(handler));
|
||||
} else {
|
||||
|
|
@ -847,25 +587,7 @@ export class Handler {
|
|||
}
|
||||
builder.addCode(")");
|
||||
return builder;
|
||||
},
|
||||
coalesce: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
|
||||
const builder = new QueryBuilder();
|
||||
builder.addCode("COALESCE(");
|
||||
for (let i = 0; i < a.length; i++) {
|
||||
const e = a[i];
|
||||
if (e instanceof Attribute || e instanceof AttributeAlias) builder.addCode(e.getString());
|
||||
else if (e instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(e.toString()));
|
||||
else if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
|
||||
builder.append(e.serialize(handler));
|
||||
} else {
|
||||
builder.addInjection(e);
|
||||
}
|
||||
if (i < a.length - 1) builder.addCode(", ");
|
||||
}
|
||||
builder.addCode(")");
|
||||
return builder;
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
datatypes = {
|
||||
|
|
@ -897,7 +619,7 @@ export class Handler {
|
|||
builder.addCode(")");
|
||||
return builder;
|
||||
},
|
||||
bool: dataTypeNoArg("tinyint"),
|
||||
bool: dataTypeNoArg("bool"),
|
||||
bit: dataTypeNoArg("bit"),
|
||||
tinyint: dataTypeNoArg("tinyint"),
|
||||
smallint: dataTypeNoArg("smallint"),
|
||||
|
|
@ -953,9 +675,7 @@ function joinArg(type: string) {
|
|||
const builder = new QueryBuilder();
|
||||
for (let i = 0; i < a.length; i++) {
|
||||
const d = a[i];
|
||||
if (d instanceof Attribute || d instanceof AttributeAlias) builder.addCode(d.getString(handler));
|
||||
else if (d instanceof Alias)
|
||||
builder.addCode(handler.builders.escapeID(d.toString()));
|
||||
if (d instanceof Attribute) builder.addCode(d.toString(handler));
|
||||
else if (d instanceof Modifier || d instanceof selectQuery || d instanceof Aggregation) {
|
||||
builder.addCode("(");
|
||||
builder.append(d.serialize(handler));
|
||||
|
|
|
|||
35
src/funcs.ts
35
src/funcs.ts
|
|
@ -1,8 +1,7 @@
|
|||
import { Alias } from "./alias.js";
|
||||
import { Attribute, Table } from "./db.js";
|
||||
import { Aggregation, BooleanModifier, checkConstraint, Datatype, foreignConstraint, joinCross, joinNatural, usingJoin, onJoin, NumberModifier, StringModifier, uniqueConstraint } from "./dbStructure.js";
|
||||
import { insertQuery, removeQuery, selectQuery, updateQuery } from "./query.js";
|
||||
import { allModifierInput, joinType, selectElements, selectFromElements } from "./types.js";
|
||||
import { Attribute, Table } from "./db";
|
||||
import { Aggregation, BooleanModifier, checkConstraint, Datatype, foreignConstraint, NumberModifier, StringModifier, uniqueConstraint } from "./dbStructure";
|
||||
import { insertQuery, removeQuery, selectQuery, updateQuery } from "./query";
|
||||
import { allModifierInput, selectElements, selectFromElements } from "./types";
|
||||
|
||||
//modifiers
|
||||
export const and = (...args: BooleanModifier[]) => new BooleanModifier("and", args);
|
||||
|
|
@ -19,12 +18,8 @@ export const divide = (...args: allModifierInput[]) => new NumberModifier("divid
|
|||
|
||||
export const not = (arg: allModifierInput) => new BooleanModifier("not", [arg]);
|
||||
export const like = (a: allModifierInput, b: allModifierInput) => new BooleanModifier("like", [a, b]);
|
||||
export const regexp = (a: allModifierInput, b: allModifierInput) => new BooleanModifier("regexp", [a, b]);
|
||||
|
||||
export const exists = (q: selectQuery) => new BooleanModifier("exists", [q]);
|
||||
|
||||
export const concat = (...args: allModifierInput[]) => new StringModifier("concat", args);
|
||||
export const coalesce = (...args: allModifierInput[]) => new StringModifier("coalesce", args);
|
||||
|
||||
//aggregations
|
||||
export const count = (a: Attribute) => new Aggregation("count", a);
|
||||
|
|
@ -33,34 +28,12 @@ export const avg = (a: Attribute) => new Aggregation("avg", a);
|
|||
export const min = (a: Attribute) => new Aggregation("min", a);
|
||||
export const max = (a: Attribute) => new Aggregation("max", a);
|
||||
|
||||
//join
|
||||
|
||||
export const crossJoin = (...tables: Table[]) => new joinCross(tables);
|
||||
|
||||
export const naturalJoin = (...tables: Table[]) => new joinNatural(tables, joinType.inner);
|
||||
export const leftNaturalJoin = (...tables: Table[]) => new joinNatural(tables, joinType.left);
|
||||
export const rightNaturalJoin = (...tables: Table[]) => new joinNatural(tables, joinType.right);
|
||||
export const fullNaturalJoin = (...tables: Table[]) => new joinNatural(tables, joinType.full);
|
||||
|
||||
export const innerJoinUsing = (tableA: Table, tableB: Table, ...using: Attribute[]) => new usingJoin(tableA, tableB, joinType.inner, using);
|
||||
export const leftJoinUsing = (tableA: Table, tableB: Table, ...using: Attribute[]) => new usingJoin(tableA, tableB, joinType.left, using);
|
||||
export const rightJoinUsing = (tableA: Table, tableB: Table, ...using: Attribute[]) => new usingJoin(tableA, tableB, joinType.right, using);
|
||||
export const fullJoinUsing = (tableA: Table, tableB: Table, ...using: Attribute[]) => new usingJoin(tableA, tableB, joinType.full, using);
|
||||
|
||||
export const innerJoinOn = (tableA: Table, tableB: Table, on: BooleanModifier) => new onJoin(tableA, tableB, joinType.inner, on);
|
||||
export const leftJoinOn = (tableA: Table, tableB: Table, on: BooleanModifier) => new onJoin(tableA, tableB, joinType.left, on);
|
||||
export const rightJoinOn = (tableA: Table, tableB: Table, on: BooleanModifier) => new onJoin(tableA, tableB, joinType.right, on);
|
||||
export const fullJoinOn = (tableA: Table, tableB: Table, on: BooleanModifier) => new onJoin(tableA, tableB, joinType.full, on);
|
||||
|
||||
//query
|
||||
export const select = (args: selectElements[], from: selectFromElements) => new selectQuery(args, from);
|
||||
export const insert = (...attrs: Attribute[]) => new insertQuery(attrs);
|
||||
export const update = (table: Table) => new updateQuery(table);
|
||||
export const remove = (table: Table) => new removeQuery(table);
|
||||
|
||||
//alias
|
||||
export const alias = (a: selectElements, name: string) => new Alias(a, name);
|
||||
|
||||
//datatypes
|
||||
|
||||
export const CHAR = (size: number) => new Datatype("char", [size]);
|
||||
|
|
|
|||
49
src/query.ts
49
src/query.ts
|
|
@ -1,8 +1,7 @@
|
|||
import { AttributeAlias } from "./alias.js";
|
||||
import { Attribute, DB, Table } from "./db.js";
|
||||
import { BooleanModifier, Modifier } from "./dbStructure.js";
|
||||
import { Handler } from "./defaultHandler.js";
|
||||
import { allModifierInput, order, primaryData, selectElements, selectFromElements, serializeReturn } from "./types.js";
|
||||
import { Attribute, DB, Table } from "./db";
|
||||
import { BooleanModifier, Modifier } from "./dbStructure";
|
||||
import { Handler } from "./defaultHandler";
|
||||
import { allModifierInput, primaryData, selectElements, selectFromElements, serializeReturn } from "./types";
|
||||
|
||||
|
||||
export class Query {
|
||||
|
|
@ -49,7 +48,6 @@ export class QueryBuilder {
|
|||
this.list.push(...qb.list);
|
||||
}
|
||||
appendEnding(qb: QueryBuilder) {
|
||||
if (qb.isEmpty()) return;
|
||||
this.append(qb);
|
||||
this.list.push([false, ";"]);
|
||||
}
|
||||
|
|
@ -74,8 +72,8 @@ export class selectQuery {
|
|||
this.whereD = m;
|
||||
return this;
|
||||
}
|
||||
groupByD: (Attribute | AttributeAlias)[] = [];
|
||||
groupBy(a: (Attribute | AttributeAlias)[]) {
|
||||
groupByD: Attribute[] = [];
|
||||
groupBy(a: Attribute[]) {
|
||||
this.groupByD = a;
|
||||
return this;
|
||||
}
|
||||
|
|
@ -84,22 +82,9 @@ export class selectQuery {
|
|||
this.havingD = m;
|
||||
return this;
|
||||
}
|
||||
|
||||
orderByD: ([allModifierInput, order])[] = [];
|
||||
addOrderBy(a: allModifierInput, o: order = order.ASC) {
|
||||
this.orderByD.push([a, o]);
|
||||
return this;
|
||||
}
|
||||
orderBY(a: allModifierInput, o: order = order.ASC) {
|
||||
this.orderByD = [[a, o]];
|
||||
return this;
|
||||
}
|
||||
|
||||
limitD: number | null = null;
|
||||
limitOffsetD: number | null = null;
|
||||
limit(i: number, offset: number = 0) {
|
||||
limit(i: number) {
|
||||
this.limitD = i;
|
||||
this.limitOffsetD = offset;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -107,12 +92,11 @@ export class selectQuery {
|
|||
return handler.querys.select(handler, this);
|
||||
}
|
||||
|
||||
async query(db: DB, printQuery = false) {
|
||||
async query(db: DB) {
|
||||
const handler = db.getHandler();
|
||||
const builder = this.serialize(handler);
|
||||
const s = handler.builders.query(builder);
|
||||
let readResp = await db.query(s, printQuery);
|
||||
return handler.responses.readResponse(readResp);
|
||||
return await db.query(s);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -145,12 +129,11 @@ export class insertQuery {
|
|||
serialize(handler: Handler): QueryBuilder {
|
||||
return handler.querys.insert(handler, this);
|
||||
}
|
||||
async query(db: DB, printQuery = false) {
|
||||
async query(db: DB) {
|
||||
const handler = db.getHandler();
|
||||
const builder = this.serialize(handler);
|
||||
const s = handler.builders.query(builder);
|
||||
let readResp = await db.query(s, printQuery);
|
||||
return handler.responses.insertResponse(readResp);
|
||||
return await db.query(s);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -174,12 +157,11 @@ export class updateQuery {
|
|||
serialize(handler: Handler): QueryBuilder {
|
||||
return handler.querys.update(handler, this);
|
||||
}
|
||||
async query(db: DB, printQuery = false) {
|
||||
async query(db: DB) {
|
||||
const handler = db.getHandler();
|
||||
const builder = this.serialize(handler);
|
||||
const s = handler.builders.query(builder);
|
||||
let readResp = await db.query(s, printQuery);
|
||||
return handler.responses.writeResponse(readResp);
|
||||
return await db.query(s);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -196,11 +178,10 @@ export class removeQuery {
|
|||
serialize(handler: Handler): QueryBuilder {
|
||||
return handler.querys.remove(handler, this);
|
||||
}
|
||||
async query(db: DB, printQuery = false) {
|
||||
async query(db: DB) {
|
||||
const handler = db.getHandler();
|
||||
const builder = this.serialize(handler);
|
||||
const s = handler.builders.query(builder);
|
||||
let readResp = await db.query(s, printQuery);
|
||||
return handler.responses.writeResponse(readResp);
|
||||
return await db.query(s);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
import { AttributeAlias } from "./alias.js";
|
||||
import { Attribute } from "./db.js";
|
||||
import { primaryData } from "./types.js";
|
||||
|
||||
export class singleResponse {
|
||||
[key: string]: primaryData | any;
|
||||
constructor(r: object) {
|
||||
Object.assign(this, r);
|
||||
}
|
||||
getVal(a: Attribute | AttributeAlias) {
|
||||
return this[a.toString()];
|
||||
}
|
||||
}
|
||||
|
||||
export class readResponse extends Array<singleResponse>{
|
||||
constructor(rows: ({ [key: string]: primaryData })[]) {
|
||||
super();
|
||||
for(let i = 0; i < rows.length; i++){
|
||||
this[i] = new singleResponse(rows[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export class writeResponse {
|
||||
affectedRows: number;
|
||||
constructor(affectedRows: number) {
|
||||
this.affectedRows = affectedRows;
|
||||
}
|
||||
}
|
||||
|
||||
export class insertResponse extends writeResponse {
|
||||
insertId: number;
|
||||
constructor(affectedRows: number, insertId: number) {
|
||||
super(affectedRows);
|
||||
this.insertId = insertId;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
import crypto from "crypto";
|
||||
|
||||
export const sha256 = (d: any) => crypto.createHash('sha256').update(String(d)).digest('base64');
|
||||
37
src/types.ts
37
src/types.ts
|
|
@ -1,14 +1,12 @@
|
|||
import { Alias, AttributeAlias, TableAlias } from "./alias.js";
|
||||
import { Attribute, Table } from "./db.js";
|
||||
import { Aggregation, BooleanModifier, Datatype, Joins, Modifier } from "./dbStructure.js";
|
||||
import { QueryBuilder, selectQuery } from "./query.js";
|
||||
import { Attribute, Table } from "./db";
|
||||
import { Aggregation, BooleanModifier, Datatype, Joins, Modifier } from "./dbStructure";
|
||||
import { QueryBuilder, selectQuery } from "./query";
|
||||
|
||||
export type primaryData = string | number | boolean | null;
|
||||
export type allModifierInput = primaryData | Modifier | selectQuery | Attribute | AttributeAlias | Aggregation | Alias;
|
||||
export type allModifierInput = primaryData | Modifier | selectQuery | Attribute | Aggregation;
|
||||
|
||||
export type selectElements = primaryData | Attribute | AttributeAlias | Aggregation | selectQuery | Alias;
|
||||
export type selectFromElements = TableAlias | Table | Joins | null;
|
||||
export type joinElements = Table | Joins;
|
||||
export type selectElements = primaryData | Attribute | Aggregation | selectQuery
|
||||
export type selectFromElements = Table | Joins | null;
|
||||
|
||||
export type serializeReturn = [string, primaryData[]];
|
||||
|
||||
|
|
@ -20,7 +18,7 @@ export type attributeSettings = {
|
|||
default?: primaryData,
|
||||
notNull?: boolean
|
||||
primaryKey?: boolean,
|
||||
foreignKey?: {
|
||||
foreginKey?: {
|
||||
link: Attribute,
|
||||
onDelete?: onAction,
|
||||
onUpdate?: onAction
|
||||
|
|
@ -35,7 +33,7 @@ export type extendedAttributeSettings = {
|
|||
default?: primaryData,
|
||||
notNull?: boolean
|
||||
primaryKey?: boolean,
|
||||
foreignKey?: {
|
||||
foreginKey?: {
|
||||
link: Attribute,
|
||||
onDelete?: onAction,
|
||||
onUpdate?: onAction
|
||||
|
|
@ -50,22 +48,3 @@ export enum onAction {
|
|||
setNull,
|
||||
setDefault
|
||||
}
|
||||
|
||||
export enum joinType {
|
||||
inner,
|
||||
left,
|
||||
right,
|
||||
full,
|
||||
cross
|
||||
}
|
||||
|
||||
export enum dbType {
|
||||
mariadb,
|
||||
//mysql,
|
||||
postgres,
|
||||
}
|
||||
|
||||
export enum order {
|
||||
ASC,
|
||||
DESC
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES6",
|
||||
"module": "ES6",
|
||||
"module": "CommonJS",
|
||||
"lib": ["es6"],
|
||||
"types": ["node"],
|
||||
"declaration": true,
|
||||
|
|
|
|||
Loading…
Reference in a new issue