Merge pull request #20 from lbausch/development

v3.0.3

Author: lbausch

.env.example

@@ -8,15 +8,17 @@ APP_TIMEZONE=Europe/Berlin
 
 # Database for SQLgreyGUI
 # If you want to use a single database for both SQLgreyGUI and SQLgrey use only this config block
-DB_CONNECTION=mysql
+DB_CONNECTION=sqlgreygui
+DB_DRIVER=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=sqlgrey
 DB_USERNAME=sqlgrey
 DB_PASSWORD=sqlgrey
 
 # Uncomment the following lines if SQLgrey resides in a different database
-#SQLGREY_DB_CONNECTION=mysql
+#SQLGREY_DB_CONNECTION=sqlgrey
+SQLGREY_DB_DRIVER=mysql
 #SQLGREY_DB_HOST=null
 #SQLGREY_DB_PORT=3306
 #SQLGREY_DB_DATABASE=null

.travis.yml

@@ -20,14 +20,14 @@ cache:
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS testing;"
   - mysql -e "GRANT ALL ON testing.* to 'homestead'@'%' IDENTIFIED BY 'secret';"
-  - mysql --database testing < ci/sqlgrey.sql
+  - mysql --database testing < tests/fixtures/sqlgrey.sql
   - . $HOME/.nvm/nvm.sh
   - nvm install stable
   - nvm use stable
   - npm install -g yarn
 
 install:
-  - cp -nv ci/.env.testing .env
+  - cp -nv tests/fixtures/.env.testing .env
   - composer install --no-interaction
   - php artisan key:generate
   - php artisan migrate --force

README.md

@@ -14,4 +14,3 @@ Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel
 
 ## Documentation
 Visit the [official homepage](https://lbausch.github.io/SQLgreyGUI/) for requirements, installation instructions and further information.
-

circle.yml

@@ -13,7 +13,7 @@ database:
   override:
     - mysql -uubuntu -e "CREATE DATABASE IF NOT EXISTS testing;"
     - mysql -uubuntu -e "GRANT ALL ON testing.* to 'homestead'@'%' IDENTIFIED BY 'secret';"
-    - mysql -uubuntu --database testing < ci/sqlgrey.sql
+    - mysql -uubuntu --database testing < tests/fixtures/sqlgrey.sql
 
 general:
   artifacts:
@@ -29,7 +29,7 @@ test:
   pre:
     - "./vendor/laravel/dusk/bin/chromedriver-linux":
         background: true
-    - cp ci/.env.testing .env
+    - cp tests/fixtures/.env.testing .env
     - php artisan key:generate
     - php artisan migrate
     - php artisan passport:install