不要怂,就是干,撸起袖子干!

Commit 95320e12 by Sascha Depold Committed by GitHub

Update collaboration related scripts + docs (#13530)

* docs(collaboration): fix docker usage

* fix(collaboration): verification of mariadb setup
1 parent 56bb1d6e
Showing with 5 additions and 5 deletions
...@@ -125,10 +125,10 @@ If you're happy to run tests only against an SQLite database, you can skip this ...@@ -125,10 +125,10 @@ If you're happy to run tests only against an SQLite database, you can skip this
If you have Docker installed, use any of the following commands to start fresh local databases of the dialect of your choice: If you have Docker installed, use any of the following commands to start fresh local databases of the dialect of your choice:
* `npm run setup-mariadb` * `npm run start-mariadb`
* `npm run setup-mysql` * `npm run start-mysql`
* `npm run setup-postgres` * `npm run start-postgres`
* `npm run setup-mssql` * `npm run start-mssql`
*Note:* if you're using Windows, make sure you run these from Git Bash (or another MinGW environment), since these commands will execute bash scripts. Recall that [it's very easy to include Git Bash as your default integrated terminal on Visual Studio Code](https://code.visualstudio.com/docs/editor/integrated-terminal). *Note:* if you're using Windows, make sure you run these from Git Bash (or another MinGW environment), since these commands will execute bash scripts. Recall that [it's very easy to include Git Bash as your default integrated terminal on Visual Studio Code](https://code.visualstudio.com/docs/editor/integrated-terminal).
......
...@@ -11,6 +11,6 @@ docker-compose -p sequelize-mariadb-103 up -d ...@@ -11,6 +11,6 @@ docker-compose -p sequelize-mariadb-103 up -d
docker exec sequelize-mariadb-103 \ docker exec sequelize-mariadb-103 \
mysql --host 127.0.0.1 --port 3306 -uroot -psequelize_test -e "GRANT ALL ON *.* TO 'sequelize_test'@'%' with grant option; FLUSH PRIVILEGES;" mysql --host 127.0.0.1 --port 3306 -uroot -psequelize_test -e "GRANT ALL ON *.* TO 'sequelize_test'@'%' with grant option; FLUSH PRIVILEGES;"
node check.js DIALECT=mariadb node check.js
echo "Local MariaDB-10.3 instance is ready for Sequelize tests." echo "Local MariaDB-10.3 instance is ready for Sequelize tests."
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!