Revision: 157
http://polepos.svn.sourceforge.net/polepos/?rev=157&view=rev
Author: carlrosenberger
Date: 2010-12-07 12:09:44 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
cr: Renaming the Listholder table to ListholderJdbc, so there are no conflicts when running Datanucleus.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jdbc/NestedListsJdbc.java
Modified: trunk/polepos/src/org/polepos/teams/jdbc/NestedListsJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/NestedListsJdbc.java 2010-12-06 16:58:49 UTC (rev 156)
+++ trunk/polepos/src/org/polepos/teams/jdbc/NestedListsJdbc.java 2010-12-07 12:09:44 UTC (rev 157)
@@ -29,9 +29,9 @@
public class NestedListsJdbc extends JdbcDriver implements NestedLists {
- private static final String LISTHOLDER_TABLE = "listholder";
+ private static final String LISTHOLDER_TABLE = "listholderJdbc";
- private static final String LIST_TABLE = "list";
+ private static final String LIST_TABLE = "listJdbc";
public static final int ID = 1;
@@ -77,10 +77,10 @@
public void create() throws Throwable {
final PreparedStatement listHolderStatement =
- prepareStatement("insert into listholder (fid, fname) values (?,?)");
+ prepareStatement("insert into " + LISTHOLDER_TABLE + " (fid, fname) values (?,?)");
final PreparedStatement listStatement =
- prepareStatement("insert into list (fid, fitem, felement) values (?,?,?)");
+ prepareStatement("insert into " + LIST_TABLE + " (fid, fitem, felement) values (?,?,?)");
ListHolder root = ListHolder.generate(depth(), objectCount(), reuse());
_rootId = (int) root.id();
@@ -128,8 +128,8 @@
}
private ListHolder root() throws SQLException {
- PreparedStatement listHolderStatement = prepareStatement("select * from listholder where fid = ?");
- PreparedStatement listStatement = prepareStatement("select * from list where fid = ? order by felement");
+ PreparedStatement listHolderStatement = prepareStatement("select * from " + LISTHOLDER_TABLE + " where fid = ?");
+ PreparedStatement listStatement = prepareStatement("select * from " + LIST_TABLE + " where fid = ? order by felement");
Set<ListHolder> found = new HashSet<ListHolder>();
ListHolder root = recurseRead(listHolderStatement, listStatement, _rootId, found);
closePreparedStatement(listHolderStatement);
@@ -171,7 +171,7 @@
@Override
public void update() throws Throwable {
ListHolder root = root();
- final PreparedStatement statement = prepareStatement("update listholder set fname=? where fid=?");
+ final PreparedStatement statement = prepareStatement("update " + LISTHOLDER_TABLE + " set fname=? where fid=?");
addToCheckSum(root.update(depth(), 0, new Procedure<ListHolder>() {
@Override
public void apply(ListHolder obj) {
@@ -192,7 +192,7 @@
@Override
public void delete() throws Throwable {
ListHolder root = root();
- final PreparedStatement statement = prepareStatement("delete from listholder where fid=?");
+ final PreparedStatement statement = prepareStatement("delete from " + LISTHOLDER_TABLE + " where fid=?");
addToCheckSum(root.delete(depth(), 0, new Procedure<ListHolder>() {
@Override
public void apply(ListHolder obj) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
