Merge branch 'master' into stable

Author: sailor

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.7] 2020-01-19
+### Fixed
+- Migrations on mysql
+
 ## [0.6.6] 2020-01-19
 ### Added
 - Simple sync of votes, may drop some votes

Cargo.lock

@@ -4,7 +4,7 @@ description = "Radio-Browser Server with REST API"
 license = "agpl-3.0"
 name = "radiobrowser-api-rust"
 readme = "README.md"
-version = "0.6.6"
+version = "0.6.7"
 edition = "2018"
 
 [dependencies]

Cargo.toml

@@ -80,7 +80,7 @@ docker stack deploy -c docker-compose-traefik.yml rb
 # download distribution
 mkdir -p radiobrowser
 cd radiobrowser
-wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.6/radiobrowser-dist.tar.gz
+wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.7/radiobrowser-dist.tar.gz
 tar -zxf radiobrowser-dist.tar.gz
 
 # config database
@@ -101,9 +101,9 @@ sudo systemctl start radiobrowser
 * create database and database user
 
 ```bash
-wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.6/radiobrowser-api-rust_0.6.6_amd64.deb
+wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.7/radiobrowser-api-rust_0.6.7_amd64.deb
 sudo apt install default-mysql-server
-sudo dpkg -i radiobrowser-api-rust_0.6.6_amd64.deb
+sudo dpkg -i radiobrowser-api-rust_0.6.7_amd64.deb
 cat /usr/share/radiobrowser/init.sql | mysql
 ```
 
@@ -193,7 +193,7 @@ cd radiobrowser-api-rust
 # checkout stable
 git checkout stable
 # deploy, change email adress, for ssl with certbot
-ansible-playbook -e "email=test@example.com" -e "version=0.6.6" -e "ansible_python_interpreter=auto" -i "test.example.com,test2.example.com" ansible/playbook.yml
+ansible-playbook -e "email=test@example.com" -e "version=0.6.7" -e "ansible_python_interpreter=auto" -i "test.example.com,test2.example.com" ansible/playbook.yml
 ```
 
 ## Building

README.md

@@ -2,7 +2,7 @@ version: "3.2"
 services:
   api:
     build: ./
-    image: segleralex/radiobrowser-api-rust:0.6.6
+    image: segleralex/radiobrowser-api-rust:0.6.7
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.api.rule=Host(`${SOURCE}`)"

docker-compose-traefik.yml

@@ -2,7 +2,7 @@ version: "3.0"
 services:
   api:
     build: ./
-    image: segleralex/radiobrowser-api-rust:0.6.6
+    image: segleralex/radiobrowser-api-rust:0.6.7
     deploy:
       replicas: 1
     networks:

docker-compose.yml

@@ -347,20 +347,20 @@ r#"ALTER TABLE StationCheckHistory MODIFY COLUMN InsertTime DATETIME NOT NULL;"#
 r#"ALTER TABLE StationCheckHistory MODIFY COLUMN InsertTime TIMESTAMP NOT NULL;"#);
 
     migrations.add_migration("20200119_121000_Drop_FK_StationCheckHistory_Station",
-r#"ALTER TABLE StationCheckHistory DROP CONSTRAINT FK_StationCheckHistory_Station;"#,
+r#"ALTER TABLE StationCheckHistory DROP FOREIGN KEY FK_StationCheckHistory_Station;"#,
 r#"ALTER TABLE StationCheckHistory ADD CONSTRAINT FK_StationCheckHistory_Station FOREIGN KEY(StationUuid) REFERENCES Station(StationUuid);"#);
 
     migrations.add_migration("20200119_121100_Add_FK_StationCheckHistory_Station",
 r#"ALTER TABLE StationCheckHistory ADD CONSTRAINT FK_StationCheckHistory_Station FOREIGN KEY(StationUuid) REFERENCES Station(StationUuid) ON DELETE CASCADE;"#,
-r#"ALTER TABLE StationCheckHistory DROP CONSTRAINT FK_StationCheckHistory_Station;"#);
+r#"ALTER TABLE StationCheckHistory DROP FOREIGN KEY FK_StationCheckHistory_Station;"#);
 
     migrations.add_migration("20200119_121200_Drop_FK_StationClick_Station",
-r#"ALTER TABLE StationClick DROP CONSTRAINT FK_Station;"#,
+r#"ALTER TABLE StationClick DROP FOREIGN KEY FK_Station;"#,
 r#"ALTER TABLE StationClick ADD CONSTRAINT FK_Station FOREIGN KEY(StationUuid) REFERENCES Station(StationUuid);"#);
 
     migrations.add_migration("20200119_121300_Add_FK_StationClick_Station",
 r#"ALTER TABLE StationClick ADD CONSTRAINT FK_StationClick_Station FOREIGN KEY(StationUuid) REFERENCES Station(StationUuid) ON DELETE CASCADE;"#,
-r#"ALTER TABLE StationClick DROP CONSTRAINT FK_StationClick_Station;"#);
+r#"ALTER TABLE StationClick DROP FOREIGN KEY FK_StationClick_Station;"#);
 
     Ok(migrations)
 }