fix: mssql support
This commit is contained in:
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
- Added Theme CSS Injection code minification
|
||||
- Added Page Delete functionality
|
||||
- Dev locale .yml files in `server/locales` are now loaded
|
||||
- Added SQLite dependencies in Docker image
|
||||
|
||||
### Fixed
|
||||
- Fixed root admin refresh token fail
|
||||
@@ -16,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
- Fixed telemetry
|
||||
- Await page render job to complete before resolving
|
||||
- Fixed JSON fields for MariaDB
|
||||
- Fixed MSSQL driver support
|
||||
|
||||
### Changed
|
||||
- Moved Insert Media button in Markdown editor
|
||||
|
||||
4
Makefile
4
Makefile
@@ -38,8 +38,8 @@ docker-dev-clean: ## Clean DB, redis and data folders
|
||||
rm -rf ./data
|
||||
[[ "${DEVDB}" == "postgres" ]] && docker-compose -f ./dev/docker-postgres/docker-compose.yml -p wiki --project-directory . exec db psql --dbname=wiki --username=wikijs --command='DROP SCHEMA IF EXISTS public CASCADE; CREATE SCHEMA public' || true
|
||||
[[ "${DEVDB}" == "mysql" || "${DEVDB}" == "mariadb" ]] && docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . exec db mysql -uroot -p'wikijsrocks' -e 'DROP SCHEMA IF EXISTS wiki; CREATE SCHEMA wiki;' || true
|
||||
## [[ "${DEVDB}" = "mssql" ]] && docker-compose -f ./dev/docker-mssql/docker-compose.yml -p wiki --project-directory . exec db ls
|
||||
[[ "${DEVDB}" == "sqlite" ]] && docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . exec wiki rm -rf /wiki/db.sqlite || true
|
||||
[[ "${DEVDB}" == "mssql" ]] && docker-compose -f ./dev/docker-mssql/docker-compose.yml -p wiki --project-directory . exec db /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'W1kiJSR0cks!' -Q 'DROP DATABASE IF EXISTS wiki; CREATE DATABASE wiki;' || true
|
||||
[[ "${DEVDB}" == "sqlite" ]] && docker-compose -f ./dev/docker-sqlite/docker-compose.yml -p wiki --project-directory . exec wiki rm -rf /wiki/db.sqlite || true
|
||||
docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . exec redis redis-cli flushall
|
||||
|
||||
docker-dev-bash: ## Rebuild dockerized dev image
|
||||
|
||||
@@ -28,15 +28,6 @@ services:
|
||||
ports:
|
||||
- "11433:1433"
|
||||
|
||||
adminer:
|
||||
image: adminer:latest
|
||||
logging:
|
||||
driver: "none"
|
||||
networks:
|
||||
- wikinet
|
||||
ports:
|
||||
- "3001:8080"
|
||||
|
||||
wiki:
|
||||
build:
|
||||
context: .
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
"moment": "2.24.0",
|
||||
"moment-timezone": "0.5.23",
|
||||
"mongodb": "3.1.13",
|
||||
"mssql": "4.3.0",
|
||||
"mssql": "5.0.0-beta.1",
|
||||
"multer": "1.4.1",
|
||||
"mysql2": "1.6.4",
|
||||
"nanoid": "2.0.1",
|
||||
|
||||
Reference in New Issue
Block a user