bug fix #20

Merged
jusax23 merged 2 commits from dev into main 2023-03-24 18:53:04 +01:00
3 changed files with 14 additions and 5 deletions

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "dblang", "name": "dblang",
"version": "0.9.2", "version": "0.9.3",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "dblang", "name": "dblang",
"version": "0.9.2", "version": "0.9.3",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"mariadb": "^3.0.2", "mariadb": "^3.0.2",

View file

@ -1,6 +1,6 @@
{ {
"name": "dblang", "name": "dblang",
"version": "0.9.2", "version": "0.9.3",
"description": "", "description": "",
"main": "dist/db.js", "main": "dist/db.js",
"types": "dist/db.d.ts", "types": "dist/db.d.ts",

View file

@ -126,9 +126,9 @@ export class Handler {
const k = key[i]; const k = key[i];
if ( if (
((k.REFERENCED_TABLE_NAME ?? k.referenced_table_name) == table ((k.REFERENCED_TABLE_NAME ?? k.referenced_table_name) == table
&& (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name).toLowerCase() == attr.toLowerCase()) && (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name).toLowerCase() == attr.toLowerCase())
|| (start && (k.TABLE_NAME ?? k.table_name) == table || (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) && (k.COLUMN_NAME ?? k.column_name).toLowerCase() == attr.toLowerCase() && (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name) != null)
) { ) {
del.appendEnding(handler.querys.removeForeignKey(handler, (k.TABLE_NAME ?? k.table_name), (k.CONSTRAINT_NAME ?? k.constraint_name))); del.appendEnding(handler.querys.removeForeignKey(handler, (k.TABLE_NAME ?? k.table_name), (k.CONSTRAINT_NAME ?? k.constraint_name)));
key.splice(i--, 1); key.splice(i--, 1);
@ -223,6 +223,15 @@ export class Handler {
} }
} }
} }
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));
}
}
} }
if (changePrimary) { if (changePrimary) {
create.appendEnding(handler.querys.removePrimaryKey(handler, table.dbLangTableName)); create.appendEnding(handler.querys.removePrimaryKey(handler, table.dbLangTableName));