Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrects DDL in JPA guide #1053

Merged
merged 1 commit into from
Sep 24, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions docs/src/main/docs/guides/24_jpa.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,12 @@ Add the following file under `src/main/resources`:
[source,sql]
.`src/main/resources/greeting.ddl`
----
CREATE TABLE GREETING (
CREATE TABLE IF NOT EXISTS GREETING (
SALUTATION VARCHAR(64) NOT NULL PRIMARY KEY,
RESPONSE VARCHAR(64) NOT NULL
);

INSERT INTO GREETING (SALUTATION, RESPONSE) VALUES ('Marco', 'Polo');

MERGE INTO GREETING (SALUTATION, RESPONSE) VALUES ('Marco', 'Polo');
----

== Add an `application.yaml` File With Database Connectivity Information
Expand Down Expand Up @@ -514,6 +513,26 @@ request, and committed or rolled back when the method terminates
normally or exceptionally. The injected `EntityManager` will join the
transaction automatically.

== Add Logging

Add the following file under `src/main/resources`:

[source,properties]
.`src/main/resources/logging.properties`
----
.level=INFO
handlers=java.util.logging.ConsoleHandler
java.util.logging.ConsoleHandler.formatter=io.helidon.webserver.WebServerLogFormatter
java.util.logging.ConsoleHandler.level=FINEST
java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS %4$s %3$s !thread!: %5$s%6$s%n

com.zaxxer.hikari.level=INFO
h2database.level=WARNING
io.netty.level=INFO
org.eclipse.persistence.level=FINE
org.glassfish.jersey.server.level=CONFIG
----

== Build the Application

Execute the following from the root directory of your application:
Expand Down