From 80038ed9c435c06dee8e2e0857b3d9b05d4135ce Mon Sep 17 00:00:00 2001 From: Matchu Date: Tue, 13 Sep 2022 20:39:45 -0700 Subject: [PATCH] Add openneo_id to the dev database Specifically, we rename the dev database to `openneo_impress` for consistency with the main app, and create a second schema file for `openneo_id`, so we can do local account creation. --- package.json | 6 +- scripts/setup-mysql-dev-constants.sql | 2 +- scripts/setup-mysql-dev-schema-id.sql | 59 +++++++++++++++++++ ...sql => setup-mysql-dev-schema-impress.sql} | 2 +- scripts/setup-mysql.sql | 3 +- src/server/db.js | 2 +- 6 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 scripts/setup-mysql-dev-schema-id.sql rename scripts/{setup-mysql-dev-schema.sql => setup-mysql-dev-schema-impress.sql} (99%) diff --git a/package.json b/package.json index c9a1774..28b41b6 100644 --- a/package.json +++ b/package.json @@ -73,12 +73,12 @@ "deploy-skip-build": "ansible-playbook -i deploy/inventory.cfg deploy/playbooks/deploy.yml --extra-vars='{\"skip_build\": true}'", "cypress": "cypress open", "mysql": "mysql --host=impress.openneo.net --user=$(dotenv -p IMPRESS_MYSQL_USER) --password=$(dotenv -p IMPRESS_MYSQL_PASSWORD) --database=openneo_impress", - "mysql-dev": "mysql --host=localhost --user=impress_2020_dev --password=impress_2020_dev --database=impress_2020_dev", + "mysql-dev": "mysql --host=localhost --user=impress_2020_dev --password=impress_2020_dev --database=openneo_impress", "mysql-admin": "mysql --host=impress.openneo.net --user=matchu --password --database=openneo_impress", "mysqldump": "mysqldump --host=impress.openneo.net --user=$(dotenv -p IMPRESS_MYSQL_USER) --password=$(dotenv -p IMPRESS_MYSQL_PASSWORD)", - "download-mysql-schema": "yarn --silent mysqldump --no-data openneo_impress closet_hangers closet_lists items item_translations modeling_logs parents_swf_assets pet_types pet_states swf_assets users | sed 's/ AUTO_INCREMENT=[0-9]*//g' > scripts/setup-mysql-dev-schema.sql && yarn --silent mysqldump openneo_impress species species_translations colors color_translations zones zone_translations > scripts/setup-mysql-dev-constants.sql", + "download-mysql-schema": "yarn --silent mysqldump --no-data openneo_impress closet_hangers closet_lists items item_translations modeling_logs parents_swf_assets pet_types pet_states swf_assets users | sed 's/ AUTO_INCREMENT=[0-9]*//g' > scripts/setup-mysql-dev-schema-impress.sql && yarn --silent mysqldump --no-data openneo_id users | sed 's/ AUTO_INCREMENT=[0-9]*//g' > scripts/setup-mysql-dev-schema-id.sql && yarn --silent mysqldump openneo_impress species species_translations colors color_translations zones zone_translations > scripts/setup-mysql-dev-constants.sql", "setup-mysql": "yarn mysql-admin < scripts/setup-mysql.sql", - "setup-mysql-dev": "yarn mysql-dev < scripts/setup-mysql-dev-constants.sql && yarn mysql-dev < scripts/setup-mysql-dev-schema.sql", + "setup-mysql-dev": "yarn mysql-dev < scripts/setup-mysql-dev-constants.sql && yarn mysql-dev < scripts/setup-mysql-dev-schema-impress.sql && yarn mysql-dev --database=openneo_id < scripts/setup-mysql-dev-schema-id.sql", "build-cached-data": "ts-node --compiler=typescript-cached-transpile --transpile-only -r dotenv/config scripts/build-cached-data.js", "cache-asset-manifests": "ts-node --compiler=typescript-cached-transpile --transpile-only -r dotenv/config scripts/cache-asset-manifests.js", "delete-user": "ts-node --compiler=typescript-cached-transpile --transpile-only -r dotenv/config scripts/delete-user.js", diff --git a/scripts/setup-mysql-dev-constants.sql b/scripts/setup-mysql-dev-constants.sql index 56c4978..597da86 100644 --- a/scripts/setup-mysql-dev-constants.sql +++ b/scripts/setup-mysql-dev-constants.sql @@ -189,4 +189,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-09-12 23:55:27 +-- Dump completed on 2022-09-13 20:17:30 diff --git a/scripts/setup-mysql-dev-schema-id.sql b/scripts/setup-mysql-dev-schema-id.sql new file mode 100644 index 0000000..2848821 --- /dev/null +++ b/scripts/setup-mysql-dev-schema-id.sql @@ -0,0 +1,59 @@ +-- MariaDB dump 10.18 Distrib 10.4.17-MariaDB, for Linux (x86_64) +-- +-- Host: impress.openneo.net Database: openneo_id +-- ------------------------------------------------------ +-- Server version 5.5.62-0ubuntu0.14.04.1-log + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `users` +-- + +DROP TABLE IF EXISTS `users`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `users` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(20) NOT NULL, + `encrypted_password` char(64) NOT NULL, + `email` varchar(50) NOT NULL, + `password_salt` char(32) NOT NULL, + `reset_password_token` varchar(255) DEFAULT NULL, + `sign_in_count` int(11) DEFAULT '0', + `current_sign_in_at` datetime DEFAULT NULL, + `last_sign_in_at` datetime DEFAULT NULL, + `current_sign_in_ip` varchar(255) DEFAULT NULL, + `last_sign_in_ip` varchar(255) DEFAULT NULL, + `failed_attempts` int(11) DEFAULT '0', + `unlock_token` varchar(255) DEFAULT NULL, + `locked_at` datetime DEFAULT NULL, + `created_at` datetime DEFAULT NULL, + `updated_at` datetime DEFAULT NULL, + `reset_password_sent_at` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `index_users_on_email` (`email`), + UNIQUE KEY `index_users_on_reset_password_token` (`reset_password_token`), + UNIQUE KEY `index_users_on_unlock_token` (`unlock_token`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2022-09-13 20:17:22 diff --git a/scripts/setup-mysql-dev-schema.sql b/scripts/setup-mysql-dev-schema-impress.sql similarity index 99% rename from scripts/setup-mysql-dev-schema.sql rename to scripts/setup-mysql-dev-schema-impress.sql index 7353fac..81260ff 100644 --- a/scripts/setup-mysql-dev-schema.sql +++ b/scripts/setup-mysql-dev-schema-impress.sql @@ -265,4 +265,4 @@ CREATE TABLE `users` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-09-12 23:55:19 +-- Dump completed on 2022-09-13 20:17:20 diff --git a/scripts/setup-mysql.sql b/scripts/setup-mysql.sql index a6a4a21..f44586a 100644 --- a/scripts/setup-mysql.sql +++ b/scripts/setup-mysql.sql @@ -31,7 +31,8 @@ GRANT SELECT, DELETE ON item_outfit_relationships TO impress2020; GRANT SELECT ON neopets_connections TO impress2020; GRANT SELECT, INSERT, UPDATE, DELETE ON outfits TO impress2020; GRANT SELECT, UPDATE ON users TO impress2020; -GRANT SELECT, UPDATE ON openneo_id.users TO impress2020; +GRANT SELECT, INSERT, UPDATE ON openneo_id.users TO impress2020; -- mysqldump GRANT LOCK TABLES ON * TO impress2020; +GRANT LOCK TABLES ON openneo_id.* TO impress2020; diff --git a/src/server/db.js b/src/server/db.js index 828382f..06081fc 100644 --- a/src/server/db.js +++ b/src/server/db.js @@ -15,7 +15,7 @@ const defaultOptions = host: "localhost", user: "impress_2020_dev", password: "impress_2020_dev", - database: "impress_2020_dev", + database: "openneo_impress", } : { host: "impress.openneo.net",