verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

feat: refs #5483 unify DB #1955

Merged
alexm merged 11 commits from 5483-unifyDb into dev 2024-01-29 05:58:54 +00:00
Conversation 0 Commits 11 Files Changed 2658 +20 -17
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce0684e6ff - Show all commits

10
Jenkinsfile vendored
View File

@ -106,13 +106,15 @@ pipeline {
}} }}
steps { steps {
configFileProvider([ configFileProvider([
configFile(fileId: "config.${env.NODE_ENV}.ini", configFile(fileId: "config.${NODE_ENV}.ini",
variable: 'MYSQL_CONFIG') variable: 'MYSQL_CONFIG')
]) { ]) {
sh 'cp "$MYSQL_CONFIG" db/config.$NODE_ENV.ini' sh 'mkdir -p db/remotes'
sh 'cp "$MYSQL_CONFIG" db/remotes/$NODE_ENV.ini'
}
nodejs('node-v20') {
sh 'npx myt push $NODE_ENV --force --commit'
} }
sh 'db/import-changes.sh -f $NODE_ENV'
} }
} }
} }

3
back/tests.js
View File

@ -26,7 +26,8 @@ async function test() {
await myt.init({ await myt.init({
workspace: path.join(__dirname, '..'), workspace: path.join(__dirname, '..'),
random: true, random: true,
ci: isCI ci: isCI,
network: isCI ? 'jenkins' : null
}); });
const {dbConfig} = await myt.run(Run); const {dbConfig} = await myt.run(Run);

8
db/dump/fixtures.after.sql
View File

@ -14,10 +14,10 @@ INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, max
VALUES(1, NULL, 1, 300, 1); VALUES(1, NULL, 1, 300, 1);
*/ */
-- XXX: eti -- XXX: eti
/* #5483
INSERT INTO vn.travel (id,shipped,landed,warehouseInFk,warehouseOutFk,`ref`,m3,kg,cargoSupplierFk) INSERT INTO vn.travel (id,shipped,landed,warehouseInFk,warehouseOutFk,`ref`,m3,kg,cargoSupplierFk)
VALUES (9,'2022-05-20','2022-05-20',13,4,'nine travel',69.0,600,1); VALUES (9,'2022-05-20','2022-05-20',13,4,'nine travel',69.0,600,1);
/* #5483
INSERT INTO vn.entry (id, supplierFk, dated, invoiceNumber, evaNotes, travelFk, companyFk) INSERT INTO vn.entry (id, supplierFk, dated, invoiceNumber, evaNotes, travelFk, companyFk)
VALUES VALUES
(9, 1, '0000-00-00 00:00:00', 'Movement 9', 'observation nine', 8, 442), (9, 1, '0000-00-00 00:00:00', 'Movement 9', 'observation nine', 8, 442),
@ -222,10 +222,10 @@ INSERT INTO vn.expeditionStateType (id, description, code)
INSERT INTO vn.expedition (agencyModeFk,ticketFk,isBox,counter,hostFk,hasNewRoute) INSERT INTO vn.expedition (agencyModeFk,ticketFk,isBox,counter,hostFk,hasNewRoute)
VALUES (1,21,1,1,'',0); VALUES (1,21,1,1,'',0);
/* #5483
INSERT INTO vn.sectorCollection (id, created, userFk, sectorFk) INSERT INTO vn.sectorCollection (id, created, userFk, sectorFk)
VALUES(18, '2022-07-29 09:03:31', 9, 1); VALUES(18, '2022-07-29 09:03:31', 9, 1);
*/
INSERT INTO vn.saleGroup (id, created, userFk, parkingFk, sectorFk) INSERT INTO vn.saleGroup (id, created, userFk, parkingFk, sectorFk)
VALUES(3, '2022-07-29 07:18:49', 9, NULL, 1); VALUES(3, '2022-07-29 07:18:49', 9, NULL, 1);

14
package-lock.json generated
View File

@ -54,7 +54,7 @@
"@babel/plugin-syntax-dynamic-import": "^7.7.4", "@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/preset-env": "^7.11.0", "@babel/preset-env": "^7.11.0",
"@babel/register": "^7.7.7", "@babel/register": "^7.7.7",
"@verdnatura/myt": "^1.5.31", "@verdnatura/myt": "^1.5.32",
"angular-mocks": "^1.7.9", "angular-mocks": "^1.7.9",
"babel-jest": "^26.0.1", "babel-jest": "^26.0.1",
"babel-loader": "^8.2.4", "babel-loader": "^8.2.4",
@ -3375,9 +3375,9 @@
} }
}, },
"node_modules/@verdnatura/myt": { "node_modules/@verdnatura/myt": {
"version": "1.5.31", "version": "1.5.32",
"resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.31.tgz", "resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.32.tgz",
"integrity": "sha512-1mh5lY+gYRnvZsJUmc4t5kTyoo4uSvKJBI6KE1H+VEOnF9uuxSlie6srM04KexjzXIlrWa3xnZIYDrXP2D+fAQ==", "integrity": "sha512-LAxg2Ri+QWuFjWbm9Hf5iPE4i5qqGTrKtgwOuNzTri8bErCwPbQRJWgIJBv4xKTppXTm7tBWOUF4+IBf6Ep8Nw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@sqltools/formatter": "^1.2.5", "@sqltools/formatter": "^1.2.5",
@ -30604,9 +30604,9 @@
} }
}, },
"@verdnatura/myt": { "@verdnatura/myt": {
"version": "1.5.31", "version": "1.5.32",
"resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.31.tgz", "resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.32.tgz",
"integrity": "sha512-1mh5lY+gYRnvZsJUmc4t5kTyoo4uSvKJBI6KE1H+VEOnF9uuxSlie6srM04KexjzXIlrWa3xnZIYDrXP2D+fAQ==", "integrity": "sha512-LAxg2Ri+QWuFjWbm9Hf5iPE4i5qqGTrKtgwOuNzTri8bErCwPbQRJWgIJBv4xKTppXTm7tBWOUF4+IBf6Ep8Nw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@sqltools/formatter": "^1.2.5", "@sqltools/formatter": "^1.2.5",

2
package.json
View File

@ -57,7 +57,7 @@
"@babel/plugin-syntax-dynamic-import": "^7.7.4", "@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/preset-env": "^7.11.0", "@babel/preset-env": "^7.11.0",
"@babel/register": "^7.7.7", "@babel/register": "^7.7.7",
"@verdnatura/myt": "^1.5.31", "@verdnatura/myt": "^1.5.32",
"angular-mocks": "^1.7.9", "angular-mocks": "^1.7.9",
"babel-jest": "^26.0.1", "babel-jest": "^26.0.1",
"babel-loader": "^8.2.4", "babel-loader": "^8.2.4",