From fcdff19e6aad7724c38f2309ae5eaab3da7d5d65 Mon Sep 17 00:00:00 2001 From: Tara Gildersleeve Date: Wed, 28 Jun 2017 19:36:59 -0500 Subject: [PATCH 1/4] Apply splice patch --- pom.xml | 8 ++++ src/main/resources/application.properties | 8 +++- .../db/{hsqldb => splicemachine}/data.sql | 0 .../db/{hsqldb => splicemachine}/schema.sql | 41 +++++++++---------- 4 files changed, 34 insertions(+), 23 deletions(-) rename src/main/resources/db/{hsqldb => splicemachine}/data.sql (100%) rename src/main/resources/db/{hsqldb => splicemachine}/schema.sql (66%) diff --git a/pom.xml b/pom.xml index ff677d097..b6f02e51e 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,14 @@ runtime + + + com.splicemachine + db-client + 2.6.0.1725-SNAPSHOT + + + javax.cache diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fb07c6c50..b38520e67 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +1,14 @@ # database init, supports mysql too -database=hsqldb +database=splicemachine spring.datasource.schema=classpath*:db/${database}/schema.sql spring.datasource.data=classpath*:db/${database}/data.sql + +spring.datasource.url=jdbc:splice://localhost:1527/splicedb;user=splice;password=admin +spring.datasource.username=splice +spring.datasource.password=admin +spring.datasource.driver-class-name=com.splicemachine.db.jdbc.ClientDriver +spring.jpa.database-platform=org.hibernate.dialect.DerbyTenSevenDialect # Web spring.thymeleaf.mode=HTML diff --git a/src/main/resources/db/hsqldb/data.sql b/src/main/resources/db/splicemachine/data.sql similarity index 100% rename from src/main/resources/db/hsqldb/data.sql rename to src/main/resources/db/splicemachine/data.sql diff --git a/src/main/resources/db/hsqldb/schema.sql b/src/main/resources/db/splicemachine/schema.sql similarity index 66% rename from src/main/resources/db/hsqldb/schema.sql rename to src/main/resources/db/splicemachine/schema.sql index f3c6947b7..9d1698ee9 100644 --- a/src/main/resources/db/hsqldb/schema.sql +++ b/src/main/resources/db/splicemachine/schema.sql @@ -1,22 +1,15 @@ -DROP TABLE vet_specialties IF EXISTS; -DROP TABLE vets IF EXISTS; -DROP TABLE specialties IF EXISTS; -DROP TABLE visits IF EXISTS; -DROP TABLE pets IF EXISTS; -DROP TABLE types IF EXISTS; -DROP TABLE owners IF EXISTS; - - CREATE TABLE vets ( - id INTEGER IDENTITY PRIMARY KEY, + id INTEGER GENERATED ALWAYS AS IDENTITY, first_name VARCHAR(30), - last_name VARCHAR(30) + last_name VARCHAR(30), + primary key (id) ); CREATE INDEX vets_last_name ON vets (last_name); CREATE TABLE specialties ( - id INTEGER IDENTITY PRIMARY KEY, - name VARCHAR(80) + id INTEGER GENERATED ALWAYS AS IDENTITY, + name VARCHAR(80), + primary key(id) ); CREATE INDEX specialties_name ON specialties (name); @@ -28,37 +21,41 @@ ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_vets FOREIGN KEY ( ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_specialties FOREIGN KEY (specialty_id) REFERENCES specialties (id); CREATE TABLE types ( - id INTEGER IDENTITY PRIMARY KEY, - name VARCHAR(80) + id INTEGER GENERATED ALWAYS AS IDENTITY, + name VARCHAR(80), + primary key (id) ); CREATE INDEX types_name ON types (name); CREATE TABLE owners ( - id INTEGER IDENTITY PRIMARY KEY, + id INTEGER GENERATED ALWAYS AS IDENTITY, first_name VARCHAR(30), - last_name VARCHAR_IGNORECASE(30), + last_name VARCHAR(30), address VARCHAR(255), city VARCHAR(80), - telephone VARCHAR(20) + telephone VARCHAR(20), + primary key (id) ); CREATE INDEX owners_last_name ON owners (last_name); CREATE TABLE pets ( - id INTEGER IDENTITY PRIMARY KEY, + id INTEGER GENERATED ALWAYS AS IDENTITY, name VARCHAR(30), birth_date DATE, type_id INTEGER NOT NULL, - owner_id INTEGER NOT NULL + owner_id INTEGER NOT NULL, + primary key (id) ); ALTER TABLE pets ADD CONSTRAINT fk_pets_owners FOREIGN KEY (owner_id) REFERENCES owners (id); ALTER TABLE pets ADD CONSTRAINT fk_pets_types FOREIGN KEY (type_id) REFERENCES types (id); CREATE INDEX pets_name ON pets (name); CREATE TABLE visits ( - id INTEGER IDENTITY PRIMARY KEY, + id INTEGER GENERATED ALWAYS AS IDENTITY, pet_id INTEGER NOT NULL, visit_date DATE, - description VARCHAR(255) + description VARCHAR(255), + primary key (id) ); ALTER TABLE visits ADD CONSTRAINT fk_visits_pets FOREIGN KEY (pet_id) REFERENCES pets (id); CREATE INDEX visits_pet_id ON visits (pet_id); From 662e45b665f86cc1599d5c2571c3a421901b7193 Mon Sep 17 00:00:00 2001 From: Ben-Epstein Date: Thu, 29 Jun 2017 16:58:12 -0500 Subject: [PATCH 2/4] working with splice db --- src/main/resources/db/splicemachine/data.sql | 84 +++++++++---------- .../resources/db/splicemachine/schema.sql | 12 +-- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/main/resources/db/splicemachine/data.sql b/src/main/resources/db/splicemachine/data.sql index 16dda3e84..41e3c0474 100644 --- a/src/main/resources/db/splicemachine/data.sql +++ b/src/main/resources/db/splicemachine/data.sql @@ -1,13 +1,13 @@ -INSERT INTO vets VALUES (1, 'James', 'Carter'); -INSERT INTO vets VALUES (2, 'Helen', 'Leary'); -INSERT INTO vets VALUES (3, 'Linda', 'Douglas'); -INSERT INTO vets VALUES (4, 'Rafael', 'Ortega'); -INSERT INTO vets VALUES (5, 'Henry', 'Stevens'); -INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins'); +INSERT INTO VETS (first_name, last_name) VALUES ('James', 'Carter'); +INSERT INTO VETS (first_name, last_name) VALUES ('Helen', 'Leary'); +INSERT INTO VETS (first_name, last_name) VALUES ('Linda', 'Douglas'); +INSERT INTO VETS (first_name, last_name) VALUES ('Rafael', 'Ortega'); +INSERT INTO VETS (first_name, last_name) VALUES ('Henry', 'Stevens'); +INSERT INTO VETS (first_name, last_name) VALUES ('Sharon', 'Jenkins'); -INSERT INTO specialties VALUES (1, 'radiology'); -INSERT INTO specialties VALUES (2, 'surgery'); -INSERT INTO specialties VALUES (3, 'dentistry'); +INSERT INTO specialties (name) VALUES ('radiology'); +INSERT INTO specialties (name) VALUES ('surgery'); +INSERT INTO specialties (name) VALUES ('dentistry'); INSERT INTO vet_specialties VALUES (2, 1); INSERT INTO vet_specialties VALUES (3, 2); @@ -15,39 +15,39 @@ INSERT INTO vet_specialties VALUES (3, 3); INSERT INTO vet_specialties VALUES (4, 2); INSERT INTO vet_specialties VALUES (5, 1); -INSERT INTO types VALUES (1, 'cat'); -INSERT INTO types VALUES (2, 'dog'); -INSERT INTO types VALUES (3, 'lizard'); -INSERT INTO types VALUES (4, 'snake'); -INSERT INTO types VALUES (5, 'bird'); -INSERT INTO types VALUES (6, 'hamster'); +INSERT INTO types (name) VALUES ('cat'); +INSERT INTO types (name) VALUES ('dog'); +INSERT INTO types (name) VALUES ('lizard'); +INSERT INTO types (name) VALUES ('snake'); +INSERT INTO types (name) VALUES ('bird'); +INSERT INTO types (name) VALUES ('hamster'); -INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023'); -INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749'); -INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763'); -INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198'); -INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765'); -INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654'); -INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387'); -INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683'); -INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); -INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); +INSERT INTO owners (first_name, last_name, address, city, telephone) VALUES ('Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); -INSERT INTO pets VALUES (1, 'Leo', '2010-09-07', 1, 1); -INSERT INTO pets VALUES (2, 'Basil', '2012-08-06', 6, 2); -INSERT INTO pets VALUES (3, 'Rosy', '2011-04-17', 2, 3); -INSERT INTO pets VALUES (4, 'Jewel', '2010-03-07', 2, 3); -INSERT INTO pets VALUES (5, 'Iggy', '2010-11-30', 3, 4); -INSERT INTO pets VALUES (6, 'George', '2010-01-20', 4, 5); -INSERT INTO pets VALUES (7, 'Samantha', '2012-09-04', 1, 6); -INSERT INTO pets VALUES (8, 'Max', '2012-09-04', 1, 6); -INSERT INTO pets VALUES (9, 'Lucky', '2011-08-06', 5, 7); -INSERT INTO pets VALUES (10, 'Mulligan', '2007-02-24', 2, 8); -INSERT INTO pets VALUES (11, 'Freddy', '2010-03-09', 5, 9); -INSERT INTO pets VALUES (12, 'Lucky', '2010-06-24', 2, 10); -INSERT INTO pets VALUES (13, 'Sly', '2012-06-08', 1, 10); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Leo', '2010-09-07', 1, 1); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Basil', '2012-08-06', 6, 2); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Rosy', '2011-04-17', 2, 3); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Jewel', '2010-03-07', 2, 3); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Iggy', '2010-11-30', 3, 4); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('George', '2010-01-20', 4, 5); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Samantha', '2012-09-04', 1, 6); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Max', '2012-09-04', 1, 6); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Lucky', '2011-08-06', 5, 7); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Mulligan', '2007-02-24', 2, 8); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Freddy', '2010-03-09', 5, 9); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Lucky', '2010-06-24', 2, 10); +INSERT INTO pets (name, birth_date, type_id, owner_id) VALUES ('Sly', '2012-06-08', 1, 10); -INSERT INTO visits VALUES (1, 7, '2013-01-01', 'rabies shot'); -INSERT INTO visits VALUES (2, 8, '2013-01-02', 'rabies shot'); -INSERT INTO visits VALUES (3, 8, '2013-01-03', 'neutered'); -INSERT INTO visits VALUES (4, 7, '2013-01-04', 'spayed'); +INSERT INTO visits (pet_id, visit_date, description) VALUES (7, '2013-01-01', 'rabies shot'); +INSERT INTO visits (pet_id, visit_date, description) VALUES (8, '2013-01-02', 'rabies shot'); +INSERT INTO visits (pet_id, visit_date, description) VALUES (8, '2013-01-03', 'neutered'); +INSERT INTO visits (pet_id, visit_date, description) VALUES (7, '2013-01-04', 'spayed'); diff --git a/src/main/resources/db/splicemachine/schema.sql b/src/main/resources/db/splicemachine/schema.sql index 9d1698ee9..e1bcbcaa7 100644 --- a/src/main/resources/db/splicemachine/schema.sql +++ b/src/main/resources/db/splicemachine/schema.sql @@ -1,5 +1,5 @@ CREATE TABLE vets ( - id INTEGER GENERATED ALWAYS AS IDENTITY, + id INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), first_name VARCHAR(30), last_name VARCHAR(30), primary key (id) @@ -7,7 +7,7 @@ CREATE TABLE vets ( CREATE INDEX vets_last_name ON vets (last_name); CREATE TABLE specialties ( - id INTEGER GENERATED ALWAYS AS IDENTITY, + id INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), name VARCHAR(80), primary key(id) ); @@ -21,14 +21,14 @@ ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_vets FOREIGN KEY ( ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_specialties FOREIGN KEY (specialty_id) REFERENCES specialties (id); CREATE TABLE types ( - id INTEGER GENERATED ALWAYS AS IDENTITY, + id INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), name VARCHAR(80), primary key (id) ); CREATE INDEX types_name ON types (name); CREATE TABLE owners ( - id INTEGER GENERATED ALWAYS AS IDENTITY, + id INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), first_name VARCHAR(30), last_name VARCHAR(30), address VARCHAR(255), @@ -39,7 +39,7 @@ CREATE TABLE owners ( CREATE INDEX owners_last_name ON owners (last_name); CREATE TABLE pets ( - id INTEGER GENERATED ALWAYS AS IDENTITY, + id INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), name VARCHAR(30), birth_date DATE, type_id INTEGER NOT NULL, @@ -51,7 +51,7 @@ ALTER TABLE pets ADD CONSTRAINT fk_pets_types FOREIGN KEY (type_id) REFERENCES t CREATE INDEX pets_name ON pets (name); CREATE TABLE visits ( - id INTEGER GENERATED ALWAYS AS IDENTITY, + id INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), pet_id INTEGER NOT NULL, visit_date DATE, description VARCHAR(255), From 194afd4a5f983388d5dc6007e0e78c289334bc9a Mon Sep 17 00:00:00 2001 From: Ben-Epstein Date: Thu, 29 Jun 2017 17:16:25 -0500 Subject: [PATCH 3/4] queries working on db --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6f02e51e..7dcabb03d 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ com.splicemachine db-client - 2.6.0.1725-SNAPSHOT + 2.6.0.1726-SNAPSHOT From 241b2cef1839b4b17a20b51bc18ad28676fb2d2b Mon Sep 17 00:00:00 2001 From: Ben-Epstein Date: Fri, 30 Jun 2017 16:21:25 -0500 Subject: [PATCH 4/4] working product --- pom.xml | 9 +++++++-- src/main/resources/application.properties | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7dcabb03d..a6f943f65 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,11 @@ org.springframework.boot spring-boot-starter-web + + com.splicemachine + splice-hibernate-dialect + 2.6.0.1726-SNAPSHOT + org.springframework.boot spring-boot-starter-thymeleaf @@ -133,7 +138,7 @@ spring-boot-maven-plugin - build-info @@ -166,7 +171,7 @@ - pl.project13.maven diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b38520e67..ccaf09680 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,7 +8,7 @@ spring.datasource.url=jdbc:splice://localhost:1527/splicedb;user=splice;password spring.datasource.username=splice spring.datasource.password=admin spring.datasource.driver-class-name=com.splicemachine.db.jdbc.ClientDriver -spring.jpa.database-platform=org.hibernate.dialect.DerbyTenSevenDialect +spring.jpa.database-platform=com.splicemachine.SpliceMachineDialect # Web spring.thymeleaf.mode=HTML