IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ogerly-patch-1

Browse Source
This commit is contained in:
Moriz Wahl 2022-05-10 17:39:20 +02:00 committed by GitHub
commit f6d6f71e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
database/migrations/0026-combine_transaction_tables2.ts
View File

@ -28,7 +28,9 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
*/
// rename `state_user_id` to `user_id`
await queryFn('ALTER TABLE `state_user_transactions` RENAME COLUMN state_user_id TO user_id;')
await queryFn(
'ALTER TABLE `state_user_transactions` CHANGE COLUMN state_user_id user_id int(10);',
)
// Create new `amount` column, with a temporary default of null
await queryFn(
'ALTER TABLE `state_user_transactions` ADD COLUMN `amount` bigint(20) DEFAULT NULL AFTER `transaction_type_id`;',
@ -214,5 +216,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
await queryFn('ALTER TABLE `state_user_transactions` DROP COLUMN `memo`;')
await queryFn('ALTER TABLE `state_user_transactions` DROP COLUMN `send_sender_final_balance`;')
await queryFn('ALTER TABLE `state_user_transactions` DROP COLUMN `amount`;')
await queryFn('ALTER TABLE `state_user_transactions` RENAME COLUMN user_id TO state_user_id;')
await queryFn(
'ALTER TABLE `state_user_transactions` CHANGE COLUMN user_id state_user_id int(10);',
)
}

20
database/migrations/0027-clean_transaction_table.ts
View File

@ -11,23 +11,23 @@
export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
// drop column `transaction_id`, it is not needed
await queryFn('ALTER TABLE `transactions` DROP COLUMN `transaction_id`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `transaction_id`;')
// drop column `received`, it is a duplicate of balance_date
await queryFn('ALTER TABLE `transactions` DROP COLUMN `received`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `received`;')
// drop column `tx_hash`, it is not needed
await queryFn('ALTER TABLE `transactions` DROP COLUMN `tx_hash`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `tx_hash`;')
// drop column `signature`, it is not needed
await queryFn('ALTER TABLE `transactions` DROP COLUMN `signature`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `signature`;')
// drop column `pubkey`, it is not needed
await queryFn('ALTER TABLE `transactions` DROP COLUMN `pubkey`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `pubkey`;')
// drop column `creation_ident_hash`, it is not needed
await queryFn('ALTER TABLE `transactions` DROP COLUMN `creation_ident_hash`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `creation_ident_hash`;')
// rename `transaction_type_id` to `type_id`
await queryFn('ALTER TABLE `transactions` RENAME COLUMN transaction_type_id TO type_id;')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN transaction_type_id type_id int(10);')
// rename `linked_state_user_transaction_id` to `linked_transaction_id`
await queryFn(
'ALTER TABLE `transactions` RENAME COLUMN linked_state_user_transaction_id TO linked_transaction_id;',
'ALTER TABLE `transactions` CHANGE COLUMN linked_state_user_transaction_id linked_transaction_id int(10);',
)
}
@ -41,9 +41,9 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
// - creation_ident_hash (null)
await queryFn(
'ALTER TABLE `transactions` RENAME COLUMN linked_transaction_id TO linked_state_user_transaction_id;',
'ALTER TABLE `transactions` CHANGE COLUMN linked_transaction_id linked_state_user_transaction_id int(10);',
)
await queryFn('ALTER TABLE `transactions` RENAME COLUMN type_id TO transaction_type_id;')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN type_id transaction_type_id int(10);')
await queryFn(
'ALTER TABLE `transactions` ADD COLUMN `creation_ident_hash` binary(32) DEFAULT NULL AFTER `linked_state_user_transaction_id`;',
)

32
database/migrations/0029-clean_transaction_table.ts
View File

@ -13,35 +13,39 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
// Delete columns
// delete column `amount`
await queryFn('ALTER TABLE `transactions` DROP COLUMN `amount`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `amount`;')
// delete column `send_sender_final_balance`
await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_sender_final_balance`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `send_sender_final_balance`;')
// delete column `balance`
await queryFn('ALTER TABLE `transactions` DROP COLUMN `balance`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `balance`;')
// delete column `temp_dec_send_sender_final_balance`
await queryFn('ALTER TABLE `transactions` DROP COLUMN `temp_dec_send_sender_final_balance`;')
await queryFn(
'ALTER TABLE `transactions` DROP COLUMN IF EXISTS `temp_dec_send_sender_final_balance`;',
)
// delete column `temp_dec_diff_send_sender_final_balance`
await queryFn('ALTER TABLE `transactions` DROP COLUMN `temp_dec_diff_send_sender_final_balance`;')
await queryFn(
'ALTER TABLE `transactions` DROP COLUMN IF EXISTS `temp_dec_diff_send_sender_final_balance`;',
)
// delete column `temp_dec_old_balance`
await queryFn('ALTER TABLE `transactions` DROP COLUMN `temp_dec_old_balance`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `temp_dec_old_balance`;')
// delete column `temp_dec_diff_balance`
await queryFn('ALTER TABLE `transactions` DROP COLUMN `temp_dec_diff_balance`;')
await queryFn('ALTER TABLE `transactions` DROP COLUMN IF EXISTS `temp_dec_diff_balance`;')
// Rename columns
// rename column `dec_amount` to `amount`
await queryFn('ALTER TABLE `transactions` RENAME COLUMN `dec_amount` to `amount`;')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN `dec_amount` `amount` DECIMAL(40,20);')
// rename column `dec_balance` to `balance`
await queryFn('ALTER TABLE `transactions` RENAME COLUMN `dec_balance` to `balance`;')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN `dec_balance` `balance` DECIMAL(40,20);')
// rename column `dec_decay` to `decay`
await queryFn('ALTER TABLE `transactions` RENAME COLUMN `dec_decay` to `decay`;')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN `dec_decay` `decay` DECIMAL(40,20);')
// Drop tables
// drop `state_balances`
await queryFn('DROP TABLE `state_balances`;')
await queryFn('DROP TABLE IF EXISTS `state_balances`;')
}
export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
@ -66,9 +70,9 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
LEFT JOIN transactions ON t.uid = transactions.user_id AND t.date = transactions.balance_date;
`)
await queryFn('ALTER TABLE `transactions` RENAME COLUMN `decay` to `dec_decay`;')
await queryFn('ALTER TABLE `transactions` RENAME COLUMN `balance` to `dec_balance`;')
await queryFn('ALTER TABLE `transactions` RENAME COLUMN `amount` to `dec_amount`;')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN `decay` `dec_decay` DECIMAL(40,20);')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN `balance` `dec_balance` DECIMAL(40,20);')
await queryFn('ALTER TABLE `transactions` CHANGE COLUMN `amount` `dec_amount` DECIMAL(40,20);')
await queryFn(
'ALTER TABLE `transactions` ADD COLUMN `temp_dec_diff_balance` decimal(40,20) DEFAULT NULL AFTER linked_transaction_id;',

10
database/migrations/0035-admin_pending_creations_decimal.ts
View File

@ -8,7 +8,9 @@
export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
// rename `amount` to `amount_bigint`
await queryFn('ALTER TABLE `admin_pending_creations` RENAME COLUMN `amount` TO `amount_bigint`;')
await queryFn(
'ALTER TABLE `admin_pending_creations` CHANGE COLUMN `amount` `amount_bigint` bigint(20);',
)
// add `amount` (decimal)
await queryFn(
'ALTER TABLE `admin_pending_creations` ADD COLUMN `amount` DECIMAL(40,20) DEFAULT NULL AFTER `amount_bigint`;',
@ -37,6 +39,8 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
await queryFn(
'ALTER TABLE `admin_pending_creations` MODIFY COLUMN `amount_bigint` bigint(20) NOT NULL;',
)
await queryFn('ALTER TABLE `admin_pending_creations` DROP COLUMN `amount`;')
await queryFn('ALTER TABLE `admin_pending_creations` RENAME COLUMN `amount_bigint` TO `amount`;')
await queryFn('ALTER TABLE `admin_pending_creations` DROP COLUMN IF EXISTS `amount`;')
await queryFn(
'ALTER TABLE `admin_pending_creations` CHANGE COLUMN `amount_bigint` `amount` bigint(20);',
)
}

3
deployment/bare_metal/start.sh
View File

@ -105,8 +105,7 @@ yarn install
yarn build
if [ "$DEPLOY_SEED_DATA" = "true" ]; then
yarn dev_up
# As dev_reset is not running properly (0019-replace_login_user_id_with_state_user_id)
# yarn dev_reset
yarn dev_reset
else
yarn up
fi