From f988e1af7af2a33d2c709ff45aa87cde42cee873 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Thu, 7 Feb 2019 11:49:26 -0700 Subject: [PATCH 01/29] PAN-6 created and populated the initial accounts table. --- .../persistence/sql/local_development.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pandamonium-theorem-prover/persistence/sql/local_development.sql diff --git a/pandamonium-theorem-prover/persistence/sql/local_development.sql b/pandamonium-theorem-prover/persistence/sql/local_development.sql new file mode 100644 index 0000000..9b819aa --- /dev/null +++ b/pandamonium-theorem-prover/persistence/sql/local_development.sql @@ -0,0 +1,20 @@ +create database pandamonium; +use pandamonium; +create table accounts { +id int not null auto_increment primary key unique, +username varchar(50) not null unique, +password varchar(256) not null, +administrator_status boolean default false, +last_login date, +version int default 0 +}; +insert into accounts (username, password, administrator_status) +values ('admin', 'secret', true), +('atusa', 'secret', true), +('dantanxiaotian', 'secret', true), +('BrittanyBi', 'secret', true), +('lanlanzeliu', 'secret', true), +('tramanh305', 'secret', true); +create table definitions { + +} \ No newline at end of file From 89af852ec8d080fee1fae03c1a5b94f44d28079f Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 11:38:02 -0700 Subject: [PATCH 02/29] PAN-6 Created the DB script and updated the .travis file to create the DB in Travis --- pandamonium-theorem-prover/.travis.yml | 7 +++++++ .../persistence/sql/local_development.sql | 14 +++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml index 3dcae7a..7489a86 100644 --- a/pandamonium-theorem-prover/.travis.yml +++ b/pandamonium-theorem-prover/.travis.yml @@ -1,4 +1,7 @@ language: java +services: + - mysql + install: true sudo: false @@ -10,6 +13,10 @@ addons: before_install: - chmod +x pandamonium-theorem-prover/gradlew +before_script: + - mysql -u root -e 'CREATE DATABASE pandamonium;' + - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/sql/local_development.sql + stages: - name: build - name: unitTest diff --git a/pandamonium-theorem-prover/persistence/sql/local_development.sql b/pandamonium-theorem-prover/persistence/sql/local_development.sql index 9b819aa..ac034d3 100644 --- a/pandamonium-theorem-prover/persistence/sql/local_development.sql +++ b/pandamonium-theorem-prover/persistence/sql/local_development.sql @@ -1,13 +1,13 @@ create database pandamonium; use pandamonium; -create table accounts { +create table accounts ( id int not null auto_increment primary key unique, username varchar(50) not null unique, password varchar(256) not null, administrator_status boolean default false, last_login date, version int default 0 -}; +); insert into accounts (username, password, administrator_status) values ('admin', 'secret', true), ('atusa', 'secret', true), @@ -15,6 +15,10 @@ values ('admin', 'secret', true), ('BrittanyBi', 'secret', true), ('lanlanzeliu', 'secret', true), ('tramanh305', 'secret', true); -create table definitions { - -} \ No newline at end of file +create table definitions ( +id int not null auto_increment primary key unique, +name varchar(200) not null, +definition json not null, +notation json, +version int default 0 +); \ No newline at end of file From e28bf8cda48d703c34f8f251a76c6667e8f50394 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 11:59:33 -0700 Subject: [PATCH 03/29] PAN-6 Updated the sql script and created a gradle task to reload the database --- .../persistence/build.gradle | 16 ++++++++++++++++ .../persistence/scripts/mysql/loaddb.sh | 8 ++++++++ .../persistence/sql/local_development.sql | 1 + 3 files changed, 25 insertions(+) create mode 100755 pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/pandamonium-theorem-prover/persistence/build.gradle index b8e0e3f..86db24e 100644 --- a/pandamonium-theorem-prover/persistence/build.gradle +++ b/pandamonium-theorem-prover/persistence/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' } +description = 'Provides database access and connectivity' group 'edu.msudenver.tsp' version '1.0' @@ -14,4 +15,19 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' compile fileTree(dir: 'lib', include: '**/*.jar') + + compile 'com.mchange:c3p0:0.9.5.2' + compile 'mysql:mysql-connector-java:5.1.35' + compile 'org.hibernate:hibernate-validator:5.3.4.Final' + compile 'javax.validation:validation-api:1.1.0.Final' + compile('com.googlecode.log4jdbc:log4jdbc:1.2') { + exclude(group: 'org.slf4j') + } + + testCompile 'javax.el:javax.el-api:3.0.0' +} + +task loadDb(type: Exec, group: 'Verification', description: 'Reloads the local database.') { + workingDir "$rootDir/scripts/mysql" + commandLine './loaddb.sh' } diff --git a/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh b/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh new file mode 100755 index 0000000..53e35ce --- /dev/null +++ b/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +export MYSQL_PWD=secret + +for sqlScript in $( find ../../ -name "*.sql" -print | sort); + do + echo "**** $sqlScript ****" + mysql --batch --quick --raw --line-numbers --force --user=panda < $sqlScript + done \ No newline at end of file diff --git a/pandamonium-theorem-prover/persistence/sql/local_development.sql b/pandamonium-theorem-prover/persistence/sql/local_development.sql index ac034d3..3cdd74a 100644 --- a/pandamonium-theorem-prover/persistence/sql/local_development.sql +++ b/pandamonium-theorem-prover/persistence/sql/local_development.sql @@ -1,3 +1,4 @@ +drop database if exists pandamonium; create database pandamonium; use pandamonium; create table accounts ( From 1e77a38483d72430dd5936a3313db82f2c0f229e Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 12:16:58 -0700 Subject: [PATCH 04/29] PAN-6 Added the loadDb task to the build pipeline for Travis --- pandamonium-theorem-prover/.travis.yml | 11 +++++++---- pandamonium-theorem-prover/persistence/build.gradle | 2 +- .../persistence/scripts/mysql/loaddb.sh | 2 +- .../{sql => scripts/mysql}/local_development.sql | 0 4 files changed, 9 insertions(+), 6 deletions(-) rename pandamonium-theorem-prover/persistence/{sql => scripts/mysql}/local_development.sql (100%) diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml index 7489a86..d05b69c 100644 --- a/pandamonium-theorem-prover/.travis.yml +++ b/pandamonium-theorem-prover/.travis.yml @@ -18,15 +18,18 @@ before_script: - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/sql/local_development.sql stages: + - name: load database - name: build - - name: unitTest - - name: integrationTest + - name: unit Test + - name: integration Test jobs: include: + - stage: load database + script: ./pandamonium-theorem-prover/gradlew loaddb - stage: build script: ./pandamonium-theorem-prover/gradlew build - - stage: unitTest + - stage: unit Test script: ./pandamonium-theorem-prover/gradlew test - - stage: integrationTest + - stage: integration Test script: ./pandamonium-theorem-prover/gradlew integrationTest diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/pandamonium-theorem-prover/persistence/build.gradle index 86db24e..24c2f75 100644 --- a/pandamonium-theorem-prover/persistence/build.gradle +++ b/pandamonium-theorem-prover/persistence/build.gradle @@ -28,6 +28,6 @@ dependencies { } task loadDb(type: Exec, group: 'Verification', description: 'Reloads the local database.') { - workingDir "$rootDir/scripts/mysql" + workingDir "./scripts/mysql" commandLine './loaddb.sh' } diff --git a/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh b/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh index 53e35ce..974a80b 100755 --- a/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh +++ b/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash export MYSQL_PWD=secret -for sqlScript in $( find ../../ -name "*.sql" -print | sort); +for sqlScript in $( find . -name "*.sql" -print | sort); do echo "**** $sqlScript ****" mysql --batch --quick --raw --line-numbers --force --user=panda < $sqlScript diff --git a/pandamonium-theorem-prover/persistence/sql/local_development.sql b/pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql similarity index 100% rename from pandamonium-theorem-prover/persistence/sql/local_development.sql rename to pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql From 04c2eede15c040483e8b5ede22d42d1270b90dd3 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 12:38:09 -0700 Subject: [PATCH 05/29] PAN-6 Added the loadDb task to the build pipeline for Travis --- pandamonium-theorem-prover/.travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml index d05b69c..6d99859 100644 --- a/pandamonium-theorem-prover/.travis.yml +++ b/pandamonium-theorem-prover/.travis.yml @@ -12,24 +12,24 @@ addons: before_install: - chmod +x pandamonium-theorem-prover/gradlew + - cd pandamonium-theorem-prover before_script: - - mysql -u root -e 'CREATE DATABASE pandamonium;' - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/sql/local_development.sql stages: - - name: load database - - name: build - - name: unit Test - - name: integration Test + - name: Load Database + - name: Build + - name: Unit Tests + - name: Integration Tests jobs: include: - - stage: load database + - stage: Load Database script: ./pandamonium-theorem-prover/gradlew loaddb - - stage: build - script: ./pandamonium-theorem-prover/gradlew build - - stage: unit Test - script: ./pandamonium-theorem-prover/gradlew test - - stage: integration Test - script: ./pandamonium-theorem-prover/gradlew integrationTest + - stage: Build + script: ./gradlew build + - stage: Unit Tests + script: ./gradlew test + - stage: Integration Tests + script: ./gradlew integrationTest \ No newline at end of file From 6f67d4abca27292107af93f96b58467fb96bbb37 Mon Sep 17 00:00:00 2001 From: Alex Tusa <41128169+atusa17@users.noreply.github.com> Date: Sun, 10 Feb 2019 12:40:27 -0700 Subject: [PATCH 06/29] Updated the .travis.yml --- .travis.yml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f4c9d6..fcd17ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,35 @@ language: java +services: + - mysql + install: true +sudo: false +addons: + apt: + packages: + - oracle-java8-installer + before_install: - chmod +x pandamonium-theorem-prover/gradlew - cd pandamonium-theorem-prover +before_script: + - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/sql/local_development.sql + stages: - - name: build - - name: unit tests - - name: integration tests + - name: Load Database + - name: Build + - name: Unit Tests + - name: Integration Tests jobs: include: - - stage: build + - stage: Load Database + script: ./pandamonium-theorem-prover/gradlew loaddb + - stage: Build script: ./gradlew build - - stage: unit tests + - stage: Unit Tests script: ./gradlew test - - stage: integration tests + - stage: Integration Tests script: ./gradlew integrationTest From c13a0d5e666bd7194be4f5a386320efe1832890a Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 12:43:16 -0700 Subject: [PATCH 07/29] PAN-6 Changed the location of the SQL script --- .travis.yml | 2 +- pandamonium-theorem-prover/.travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcd17ca..7a2a90b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: - cd pandamonium-theorem-prover before_script: - - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/sql/local_development.sql + - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql stages: - name: Load Database diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml index 6d99859..abd7ccd 100644 --- a/pandamonium-theorem-prover/.travis.yml +++ b/pandamonium-theorem-prover/.travis.yml @@ -15,7 +15,7 @@ before_install: - cd pandamonium-theorem-prover before_script: - - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/sql/local_development.sql + - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql stages: - name: Load Database From 8ed4ab3f7f81151ce75f99c52aba8126c6358e93 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 12:44:11 -0700 Subject: [PATCH 08/29] PAN-6 Removed some tings from the Travis file to hopefully speed up the builds --- pandamonium-theorem-prover/.travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml index abd7ccd..319a3b2 100644 --- a/pandamonium-theorem-prover/.travis.yml +++ b/pandamonium-theorem-prover/.travis.yml @@ -4,12 +4,6 @@ services: install: true -sudo: false -addons: - apt: - packages: - - oracle-java8-installer - before_install: - chmod +x pandamonium-theorem-prover/gradlew - cd pandamonium-theorem-prover From 746213a877eb38f2b46327e08618707c5f99a29b Mon Sep 17 00:00:00 2001 From: Alex Tusa <41128169+atusa17@users.noreply.github.com> Date: Sun, 10 Feb 2019 12:44:36 -0700 Subject: [PATCH 09/29] Update .travis.yml --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a2a90b..20c1059 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,6 @@ services: install: true -sudo: false -addons: - apt: - packages: - - oracle-java8-installer - before_install: - chmod +x pandamonium-theorem-prover/gradlew - cd pandamonium-theorem-prover From 52a4cf086c714c173f0ee0d740066e903d263261 Mon Sep 17 00:00:00 2001 From: Alex Tusa <41128169+atusa17@users.noreply.github.com> Date: Sun, 10 Feb 2019 12:47:58 -0700 Subject: [PATCH 10/29] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20c1059..a03b45b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - cd pandamonium-theorem-prover before_script: - - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql + - mysql -u root < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql stages: - name: Load Database From eb88ea2d102c67c0c323fe16520c1876e1a5cf52 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 12:49:20 -0700 Subject: [PATCH 11/29] PAN-6 Fixed an issue with the .travis file --- .travis.yml | 6 ------ pandamonium-theorem-prover/.travis.yml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a2a90b..20c1059 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,6 @@ services: install: true -sudo: false -addons: - apt: - packages: - - oracle-java8-installer - before_install: - chmod +x pandamonium-theorem-prover/gradlew - cd pandamonium-theorem-prover diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml index 319a3b2..f9a5063 100644 --- a/pandamonium-theorem-prover/.travis.yml +++ b/pandamonium-theorem-prover/.travis.yml @@ -9,7 +9,7 @@ before_install: - cd pandamonium-theorem-prover before_script: - - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql + - mysql -u root < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql stages: - name: Load Database From 4e6b590fd1093e87dcec619ff2d6e033ba1bc7a1 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 12:53:03 -0700 Subject: [PATCH 12/29] PAN-6 Fixed an issue with the .travis file --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a03b45b..235ba94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ before_install: - cd pandamonium-theorem-prover before_script: - - mysql -u root < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql + - mysql -u root -e 'CREATE DATABASE pandamonium;' + - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql stages: - name: Load Database From 76a0c7b407736486af7095c879140273b7c44bd4 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 12:57:07 -0700 Subject: [PATCH 13/29] PAN-6 Fixed an issue with the .travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 235ba94..381a558 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE pandamonium;' - - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql + - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: - name: Load Database From 4bc02261a6b2147ced2fc1e701bd85ab7ae5c7c1 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:00:26 -0700 Subject: [PATCH 14/29] PAN-6 Changed the default version in the SQL script --- .../persistence/scripts/mysql/local_development.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql b/pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql index 3cdd74a..1f885cc 100644 --- a/pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql +++ b/pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql @@ -7,7 +7,7 @@ username varchar(50) not null unique, password varchar(256) not null, administrator_status boolean default false, last_login date, -version int default 0 +version int default 1 ); insert into accounts (username, password, administrator_status) values ('admin', 'secret', true), @@ -21,5 +21,5 @@ id int not null auto_increment primary key unique, name varchar(200) not null, definition json not null, notation json, -version int default 0 +version int default 1 ); \ No newline at end of file From 8be4da85b049a904447e49bc06e87f765a82c138 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:04:07 -0700 Subject: [PATCH 15/29] PAN-6 Removed duplicate .travis.yml file --- pandamonium-theorem-prover/.travis.yml | 29 -------------------------- 1 file changed, 29 deletions(-) delete mode 100644 pandamonium-theorem-prover/.travis.yml diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml deleted file mode 100644 index f9a5063..0000000 --- a/pandamonium-theorem-prover/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: java -services: - - mysql - -install: true - -before_install: - - chmod +x pandamonium-theorem-prover/gradlew - - cd pandamonium-theorem-prover - -before_script: - - mysql -u root < pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql - -stages: - - name: Load Database - - name: Build - - name: Unit Tests - - name: Integration Tests - -jobs: - include: - - stage: Load Database - script: ./pandamonium-theorem-prover/gradlew loaddb - - stage: Build - script: ./gradlew build - - stage: Unit Tests - script: ./gradlew test - - stage: Integration Tests - script: ./gradlew integrationTest \ No newline at end of file From f446b6a746c5f9bbb9df8a18ed723b39832b448a Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:20:11 -0700 Subject: [PATCH 16/29] PAN-6 Updating MySQL version in Travis --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 381a558..afaef63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,20 @@ services: install: true +addons: + apt: + sources: + - mysql-5.7-trusty + packages: + - mysql-server + - mysql-client + before_install: - chmod +x pandamonium-theorem-prover/gradlew - cd pandamonium-theorem-prover before_script: - - mysql -u root -e 'CREATE DATABASE pandamonium;' + - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: From 55a2a961f6ab3117dc36e0e396bc35464163cdc2 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:22:41 -0700 Subject: [PATCH 17/29] PAN-6 Updating loaddb gradle directory --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index afaef63..da3dc34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ stages: jobs: include: - stage: Load Database - script: ./pandamonium-theorem-prover/gradlew loaddb + script: ./gradlew loaddb - stage: Build script: ./gradlew build - stage: Unit Tests From a2bfb801cdf41936e9be6658146238add853479d Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:28:32 -0700 Subject: [PATCH 18/29] PAN-6 Created default panda user for mysql DB in .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index da3dc34..b8f5b09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' + - mysql -u root -e 'CREATE USER 'panda'@'localhost'; + - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost'; - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: From a949ce4fae63b0ef096d7d47883e384a18edaf3b Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:33:36 -0700 Subject: [PATCH 19/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8f5b09..c31f9e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - - mysql -u root -e 'CREATE USER 'panda'@'localhost'; - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost'; - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql From a5a36924443d77dbe1c53a226b6faf5d3731919d Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:35:48 -0700 Subject: [PATCH 20/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c31f9e6..ab45686 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost'; + - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost;' - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: From 6314de459d4e2192ed4c73b56e9a8c526576ec8a Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:41:26 -0700 Subject: [PATCH 21/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ab45686..5dfdd40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost;' + - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to \\'panda\\'@\\'localhost\\';' - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: From 1518bd9b735f880921f56ced3b6a81d4cc4fd152 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:44:14 -0700 Subject: [PATCH 22/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5dfdd40..da2cc98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to \\'panda\\'@\\'localhost\\';' + - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to \'panda\'@\'localhost\';' - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: From c571e24e833248bfeba764ac043ccd0531233159 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:48:49 -0700 Subject: [PATCH 23/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index da2cc98..b0d6a3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to \'panda\'@\'localhost\';' + - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to ''panda''@''localhost'';' - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: From 6fc5783732c1202c2ffe1c8d91a86767c17bc5b2 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:50:32 -0700 Subject: [PATCH 24/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b0d6a3e..f080e72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - - mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to ''panda''@''localhost'';' + - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost';" - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql stages: From aed4996c1b70d8055ab4296c7c652794921ef040 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:53:12 -0700 Subject: [PATCH 25/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f080e72..855502d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_install: before_script: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' + - mysql -u root -e "CREATE USER 'panda'@'localhost';" - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost';" - mysql -u root pandamonium < persistence/scripts/mysql/local_development.sql From ff19bf8c1c3fd4e614d898b7c37d62e11b29db30 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:57:25 -0700 Subject: [PATCH 26/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 855502d..9b07066 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ before_install: - cd pandamonium-theorem-prover before_script: + - mysql_upgrade --force -uroot -p - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - mysql -u root -e "CREATE USER 'panda'@'localhost';" - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost';" From ff6b1d956400bf3c19b35773af3396852b142d01 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 13:59:34 -0700 Subject: [PATCH 27/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b07066..933d299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - cd pandamonium-theorem-prover before_script: - - mysql_upgrade --force -uroot -p + - mysql_upgrade --force -uroot - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS pandamonium;' - mysql -u root -e "CREATE USER 'panda'@'localhost';" - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* to 'panda'@'localhost';" From 460de0700a93985eea22778a9517d5e3a09e3260 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 14:04:21 -0700 Subject: [PATCH 28/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 933d299..f063114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,6 @@ services: install: true -addons: - apt: - sources: - - mysql-5.7-trusty - packages: - - mysql-server - - mysql-client - before_install: - chmod +x pandamonium-theorem-prover/gradlew - cd pandamonium-theorem-prover From f43c73a9252a186256706e2585ffb463689ceed9 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 10 Feb 2019 14:09:04 -0700 Subject: [PATCH 29/29] PAN-6 Fixed the user creation for .travis.yml --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index f063114..933d299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,14 @@ services: install: true +addons: + apt: + sources: + - mysql-5.7-trusty + packages: + - mysql-server + - mysql-client + before_install: - chmod +x pandamonium-theorem-prover/gradlew - cd pandamonium-theorem-prover