Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15

# Conflicts: # build.gradle # persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java # persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java # services/src/main/java/edu/msudenver/tsp/services/RestService.java # services/src/main/java/edu/msudenver/tsp/services/dto/Account.java # services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java # services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java # services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java
2019-03-20 22:15:32 -06:00
parent 860e5379e6 b15ef858b0
commit 748781f10f
43 changed files with 1972 additions and 399 deletions
@@ -23,4 +23,28 @@ name varchar(200) not null,
 definition json not null,
 notation json,
 version int default 1
+);
+create table theorems (
+id int not null auto_increment primary key unique,
+name varchar(512) not null,
+theorem_type enum ('THEOREM', 'PROPOSITION', 'LEMMA', 'COROLLARY') not null,
+branch varchar(512) not null,
+referenced_definitions json,
+referenced_theorems json,
+proven_status boolean default false,
+version int default 1
+);
+CREATE TABLE proofs
+(
+  id        INT NOT NULL AUTO_INCREMENT,
+  theorem_name      VARCHAR(512) NOT NULL,
+  branch    VARCHAR(512) NOT NULL,
+  theorem   INT NOT NULL,
+  FOREIGN KEY fk_theorem (theorem) REFERENCES theorems (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  referenced_definitions JSON,
+  referenced_theorems JSON,
+  date_added DATE,
+  last_updated DATE,
+  version INT DEFAULT 1,
+  PRIMARY KEY (id)
 );