7525-devToTest #2542

Merged
alexm merged 231 commits from 7525-devToTest into test 2024-06-04 07:59:34 +00:00
4 changed files with 1 additions and 40 deletions
Showing only changes of commit 72630d613b - Show all commits

View File

@ -1,9 +1 @@
ALTER TABLE vn.item ADD COLUMN photoMotivation VARCHAR(255); ALTER TABLE vn.item ADD COLUMN photoMotivation VARCHAR(255);
CREATE TABLE vn.itemPhotoComment (
id int(11) NOT NULL AUTO_INCREMENT,
itemFk int(11) NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (itemFk) REFERENCES vn.item(id) ON UPDATE CASCADE ON DELETE CASCADE,
UNIQUE (itemFk)
);

View File

@ -35,9 +35,6 @@
"ItemPackingType": { "ItemPackingType": {
"dataSource": "vn" "dataSource": "vn"
}, },
"ItemPhotoComment": {
"dataSource": "vn"
},
"ItemTag": { "ItemTag": {
"dataSource": "vn" "dataSource": "vn"
}, },

View File

@ -215,13 +215,7 @@
"type": "hasOne", "type": "hasOne",
"model": "Packaging", "model": "Packaging",
"foreignKey": "itemFk" "foreignKey": "itemFk"
},
"photoComment": {
"type": "hasOne",
"model": "itemPhotoComment",
"foreignKey": "itemFk"
} }
}, },
"scopes": { "scopes": {
"withName": { "withName": {

View File

@ -1,22 +0,0 @@
{
"name": "ItemPhotoComment",
"base": "VnModel",
"mixins": {
"Loggable": true
},
"options": {
"mysql": {
"table": "itemPhotoComment"
}
},
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Id"
},
"itemFk": {
"type": "number"
}
}
}