move insert scripts to prevent confusion, delete also old not used stuff from community_server

community_server/db/address_types.sql

@@ -1,6 +0,0 @@
-CREATE TABLE `address_types` (
- `id` INT NOT NULL AUTO_INCREMENT,
- `name` VARCHAR(25) NOT NULL,
- `text` VARCHAR(255) NULL,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/operators.sql

@@ -1,7 +0,0 @@
-CREATE TABLE `operators` ( 
- `id` INT NOT NULL AUTO_INCREMENT , 
- `username` VARCHAR(128) NOT NULL , 
- `data_base64` VARCHAR(255) NOT NULL , 
- PRIMARY KEY (`id`), UNIQUE (`username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-

community_server/db/state_balances.sql

@@ -1,7 +0,0 @@
-CREATE TABLE `state_balances` (
-  `id` int(11) NOT NULL,
-  `state_user_id` int(11) NOT NULL,
-  `modified` datetime NOT NULL,
-  `amount` bigint(20) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/state_created.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `state_created` (
-  `id` int(11) NOT NULL,
-  `transaction_id` int(11) NOT NULL,
-  `month` tinyint(4) NOT NULL,
-  `year` smallint(6) NOT NULL,
-  `state_user_id` int(11) NOT NULL,
-  `created` datetime NOT NULL,
-  `short_ident_hash` int(11) NOT NULL,
-  PRIMARY KEY (`id`), INDEX(`short_ident_hash`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/state_group_addresses.sql

@@ -1,7 +0,0 @@
-CREATE TABLE `state_group_addresses` (
-  `id` int(11) NOT NULL,
-  `state_group_id` int(11) NOT NULL,
-  `public_key` binary(32) NOT NULL,
-  `address_type_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/state_group_relationships.sql

@@ -1,7 +0,0 @@
-CREATE TABLE `state_group_relationships` (
-  `id` int(11) NOT NULL,
-  `state_group1_id` int(11) NOT NULL,
-  `state_group2_id` int(11) NOT NULL,
-  `state_relationship_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/state_groups.sql

@@ -1,8 +0,0 @@
-CREATE TABLE `state_groups` (
- `id` INT NOT NULL AUTO_INCREMENT,
- `index_id` VARBINARY(64) NOT NULL,
- `name` VARCHAR(50) NOT NULL,
- `root_public_key` BINARY(32) NOT NULL,
- `user_count` SMALLINT NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/state_relationship_types.sql

@@ -1,6 +0,0 @@
-CREATE TABLE `state_relationship_types` (
-  `id` int(11) NOT NULL,
-  `name` varchar(25) COLLATE utf8_bin NOT NULL,
-  `text` varchar(255) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/state_users.sql

@@ -1,7 +0,0 @@
-CREATE TABLE `state_users` (
-  `id` int(11) NOT NULL,
-  `index_id` smallint(6) NOT NULL,
-  `state_group_id` int(11) NOT NULL,
-  `public_key` binary(32) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/transaction_creations.sql

@@ -1,10 +0,0 @@
-
-CREATE TABLE `transaction_creations` (
-  `id` int(11) NOT NULL,
-  `transaction_id` int(11) NOT NULL,
-  `state_user_id` int(11) NOT NULL,
-  `amount` bigint(20) NOT NULL,
-  `ident_hash` binary(32) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-

community_server/db/transaction_group_addAddress.sql

@@ -1,8 +0,0 @@
-
-CREATE TABLE `transaction_group_addaddress` (
-  `id` int(11) NOT NULL,
-  `transaction_id` int(11) NOT NULL,
-  `address_type_id` int(11) NOT NULL,
-  `public_key` binary(32) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/transaction_group_allowtrades.sql

@@ -1,8 +0,0 @@
-
-CREATE TABLE `transaction_group_allowtrades` (
-  `id` int(11) NOT NULL,
-  `transaction_id` int(11) NOT NULL,
-  `group_id` int(11) NOT NULL,
-  `allow` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/transaction_group_creates.sql

@@ -1,9 +0,0 @@
-
-CREATE TABLE `transaction_group_creates` (
-  `id` int(11) NOT NULL,
-  `transaction_id` int(11) NOT NULL,
-  `group_public_key` binary(32) NOT NULL,
-  `state_group_id` int(11) COLLATE utf8_bin NOT NULL,
-  `name` varchar(64) COLLATE utf8_bin NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/transaction_send_coins.sql

@@ -1,11 +0,0 @@
-
-CREATE TABLE `transaction_send_coins` (
-  `id` int(11) NOT NULL,
-  `transaction_id` int(11) NOT NULL,
-  `state_user_id` int(11) NOT NULL,
-  `receiver_public_key` binary(32) NOT NULL,
-  `receiver_user_id` varbinary(64) NOT NULL,
-  `amount` bigint(20) NOT NULL,
-  `sender_final_balance` bigint(20) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/transaction_signatures.sql

@@ -1,7 +0,0 @@
-CREATE TABLE `transaction_signatures` (
-  `id` int(11) NOT NULL,
-  `transaction_id` int(11) NOT NULL,
-  `signature` binary(64) NOT NULL,
-  `pubkey` binary(32) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/transaction_types.sql

@@ -1,6 +0,0 @@
-CREATE TABLE `transaction_types` (
- `id` INT NOT NULL AUTO_INCREMENT,
- `name` VARCHAR(24) NOT NULL,
- `text` VARCHAR(255) NULL,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

community_server/db/transactions.sql

@@ -1,9 +0,0 @@
-
-CREATE TABLE `transactions` (
-  `id` bigint(20) NOT NULL,
-  `state_group_id` int(11) NOT NULL,
-  `transaction_type_id` int(11) NOT NULL,
-  `tx_hash` binary(32) NOT NULL,
-  `received` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

configs/login_server/setup_db_tables/setup_hedera_group.sql

@@ -1,19 +1,19 @@
-INSERT INTO `groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `description`) VALUES
-(2, 'dockerStage2', 'docker stage2 gradido group', 'localhost', 'nginx', '/', 'gradido test group for docker and stage2');
-
-INSERT INTO `hedera_ids` (`id`, `shardNum`, `realmNum`, `num`) VALUES
-(1, 0, 0, 3),
-(2, 0, 0, 3327),
-(3, 0, 0, 413151);
-
-INSERT INTO `node_servers` (`id`, `url`, `port`, `group_id`, `server_type`, `node_hedera_id`, `last_live_sign`) VALUES
-(1, 'http://0.testnet.hedera.com', 50211, 0, 4, 2, '2000-01-01 00:00:00');
-
-INSERT INTO `hedera_accounts` (`id`, `user_id`, `account_hedera_id`, `account_key_id`, `balance`, `network_type`, `updated`) VALUES
-(1, 1, 2, 1, 1000000000000, 1, '2021-01-07 10:22:52');
-
-INSERT INTO `hedera_topics` (`id`, `topic_hedera_id`, `name`, `auto_renew_account_hedera_id`, `auto_renew_period`, `group_id`, `admin_key_id`, `submit_key_id`, `current_timeout`, `sequence_number`, `running_hash`, `running_hash_version`, `updated`) VALUES
-(1, 3, 'dockerStage2', 1, 7890000, 1, 0, 0, '2021-06-08 23:17:19', 0, NULL, 0, '2021-03-09 16:42:34');
-
-
-
+INSERT INTO `groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `description`) VALUES
+(2, 'dockerStage2', 'docker stage2 gradido group', 'localhost', 'nginx', '/', 'gradido test group for docker and stage2');
+
+INSERT INTO `hedera_ids` (`id`, `shardNum`, `realmNum`, `num`) VALUES
+(1, 0, 0, 3),
+(2, 0, 0, 3327),
+(3, 0, 0, 413151);
+
+INSERT INTO `node_servers` (`id`, `url`, `port`, `group_id`, `server_type`, `node_hedera_id`, `last_live_sign`) VALUES
+(1, 'http://0.testnet.hedera.com', 50211, 0, 4, 2, '2000-01-01 00:00:00');
+
+INSERT INTO `hedera_accounts` (`id`, `user_id`, `account_hedera_id`, `account_key_id`, `balance`, `network_type`, `updated`) VALUES
+(1, 1, 2, 1, 1000000000000, 1, '2021-01-07 10:22:52');
+
+INSERT INTO `hedera_topics` (`id`, `topic_hedera_id`, `name`, `auto_renew_account_hedera_id`, `auto_renew_period`, `group_id`, `admin_key_id`, `submit_key_id`, `current_timeout`, `sequence_number`, `running_hash`, `running_hash_version`, `updated`) VALUES
+(1, 3, 'dockerStage2', 1, 7890000, 1, 0, 0, '2021-06-08 23:17:19', 0, NULL, 0, '2021-03-09 16:42:34');
+
+
+

mariadb/Dockerfile

@@ -13,9 +13,11 @@ COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql
 # login server db
 COPY ./login_server/skeema/ .
 RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; sed  -i '1i use gradido_login;' "../b_$f"; done
+COPY ./configs/login_server/setup_db_tables ./gradido_login/insert
 RUN cd ./gradido_login/insert && for f in *.sql; do cp -- "$f" "../../c_$f";  sed  -i '1i use gradido_login;' "../../c_$f"; done
 # community server db
-COPY ./community_server/skeema/ . 
+COPY ./community_server/db/skeema/ . 
 RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed  -i '1i use gradido_community;' "../d_$f"; done
+COPY ./community_server/db/setup_db_tables ./gradido_community/insert 
 RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../e_$f";  sed  -i '1i use gradido_community;' "../../e_$f"; done
 

mariadb/setup_dbs_different_user.sh

@@ -54,7 +54,7 @@ skeema push -p$LOGIN_DB_PASSWD
 
 cd ../../..
 # populate db of community-server
-cd community_server/skeema
+cd community_server/db/skeema
 sudo cat << EOF > .skeema
 [production]
 flavor=mariadb:10.3.25

skeema/Dockerfile

@@ -22,7 +22,7 @@ WORKDIR ${DOCKER_WORKDIR}
 COPY ./skeema/.skeema .
 COPY ./login_server/skeema/ .
 COPY ./mariadb/.skeema.login ./gradido_login/.skeema
-COPY ./community_server/skeema/ . 
+COPY ./community_server/db/skeema/ . 
 COPY ./mariadb/.skeema.community ./gradido_community/.skeema
 
 CMD skeema push