Skip to content

Commit

Permalink
Upgrade MySQL version to 8; clean-up dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
isra00 committed Apr 27, 2024
1 parent 82aeb1f commit 6dfc5af
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ start start-local: stop

start-db-for-test:
@docker stop nt-mysql || true
docker run --rm -dit -p 3306:3306 --name nt-mysql --platform linux/x86_64 -e MYSQL_ROOT_PASSWORD=${NT_DB_PASSWORD} mysql:5.7-debian --bind-address=0.0.0.0
docker run --rm -dit -p 3306:3306 --name nt-mysql --platform linux/x86_64 -e MYSQL_ROOT_PASSWORD=${NT_DB_PASSWORD} mysql:8.3 --bind-address=0.0.0.0
sleep 15
@if [ -z "$NT_DB_USER" ] || [ -z "$NT_DB_PASSWORD" ] || [ -z "$NT_DB_DATABASE" ] || [ -z "$NT_DB_DATABASE_INTEGRATION" ]; then echo "Environment variables NT_DB_USER, NT_DB_PASSWORD, NT_DB_DATABASE and NT_DB_DATABASE_INTEGRATION must be set before calling this recipe" >&2; exit 1; fi
docker exec nt-mysql mysql -u${NT_DB_USER} -p${NT_DB_PASSWORD} -e "CREATE DATABASE ${NT_DB_DATABASE} COLLATE 'utf8_general_ci'"
Expand All @@ -53,7 +53,7 @@ start-db-for-test:

start-db-local:
@docker stop nt-mysql || true
docker run --rm -dit -p 3306:3306 --name nt-mysql --platform linux/x86_64 -e MYSQL_ROOT_PASSWORD=root -v /var/www/vhosts/dev-env/mysql5:/var/lib/mysql mysql:5.7-debian
docker run --rm -dit -p 3306:3306 --name nt-mysql --platform linux/x86_64 -e MYSQL_ROOT_PASSWORD=root -v /var/www/vhosts/dev-env/mysql5:/var/lib/mysql mysql:8.3
sleep 15

#No need to delete it after stopping since it's run with --rm
Expand Down
1 change: 1 addition & 0 deletions create_tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ DELIMITER ;;

DROP FUNCTION IF EXISTS `NoteToNumber`;;
CREATE FUNCTION `NoteToNumber` (`note_code` char(3)) RETURNS INT
DETERMINISTIC
BEGIN
DECLARE note_number INT;
SET note_number = CAST(SUBSTRING(note_code, LENGTH(note_code)) AS UNSIGNED);
Expand Down
1 change: 0 additions & 1 deletion templates/base.twig
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<script>var gtag = function() {}</script>
{%- else -%}
<script async src="https://www.googletagmanager.com/gtag/js?id={{ app.neoconfig.analytics_id }}"></script>
<!--<script defer src="https://unpkg.com/@tinybirdco/flock.js" data-host="https://api.tinybird.co" data-token="p.eyJ1IjogIjk5YzQ5NGE3LTFkNzQtNDJkNi05Mjc0LTY3MmExZWJiNzU5YSIsICJpZCI6ICI2YzRhYzU4OC01Y2E1LTQ3NTAtOGU5OC02YWIzNzZlNTZkZDMifQ.zSSizfwmHcMubFXVmxWSsCkIfKCDWWhBRy9US1s9oHY"></script>-->
<script>
(function () {
Expand Down
13 changes: 0 additions & 13 deletions tests/functional.suite.yml

This file was deleted.

0 comments on commit 6dfc5af

Please sign in to comment.