Skip to content

Commit 460d922

Browse files
committed
Removing load.sql as data needs to be persisted using EntityManager.persist instead of INSERT INTO. This allows the version column to be updated for optimistic locking to work. EclipseLink was lenient about it but Hibernate caught it.
1 parent 3bef075 commit 460d922

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

jpa/locking-optimistic/src/main/java/org/javaee7/jpa/locking/optimistic/MovieBean.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@ public class MovieBean {
5353

5454
@PersistenceContext
5555
EntityManager em;
56+
57+
public void addMovies() {
58+
Movie[] movies = new Movie[4];
59+
movies[0] = new Movie(1, "The Matrix", "Keanu Reeves, Laurence Fishburne, Carrie-Ann Moss");
60+
movies[1] = new Movie(2, "The Lord of The Rings", "Elijah Wood, Ian Mckellen, Viggo Mortensen");
61+
movies[2] = new Movie(3, "Inception", "Leonardo DiCaprio");
62+
movies[3] = new Movie(4, "The Shining", "Jack Nicholson, Shelley Duvall");
63+
for (Movie m : movies) {
64+
em.persist(m);
65+
}
66+
}
5667

5768
public List<Movie> listMovies() {
5869
return em.createNamedQuery("Movie.findAll", Movie.class).getResultList();

jpa/locking-optimistic/src/main/java/org/javaee7/jpa/locking/optimistic/TestServlet.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
7878
out.println("<body>");
7979
out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
8080

81+
bean.addMovies();
8182
out.println("Listing movies<br>");
8283
for (Movie m : bean.listMovies()) {
8384
out.println(m.getName() + "<br>");

jpa/locking-optimistic/src/main/resources/META-INF/load.sql

Lines changed: 0 additions & 4 deletions
This file was deleted.

jpa/locking-optimistic/src/main/resources/META-INF/persistence.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<properties>
99
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
1010
<property name="javax.persistence.schema-generation.create-source" value="metadata"/>
11-
<property name="javax.persistence.sql-load-script-source" value="META-INF/load.sql"/>
1211
</properties>
1312
</persistence-unit>
1413
</persistence>

0 commit comments

Comments
 (0)