Index: topia/src/java/org/codelutin/topia/persistence/PersistenceStorageJDBC.java diff -u topia/src/java/org/codelutin/topia/persistence/PersistenceStorageJDBC.java:1.18 topia/src/java/org/codelutin/topia/persistence/PersistenceStorageJDBC.java:1.19 --- topia/src/java/org/codelutin/topia/persistence/PersistenceStorageJDBC.java:1.18 Fri Aug 12 16:20:01 2005 +++ topia/src/java/org/codelutin/topia/persistence/PersistenceStorageJDBC.java Fri Aug 19 14:52:47 2005 @@ -23,10 +23,10 @@ * Created: 20 juillet 2005 15:25:06 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.18 $ + * @version $Revision: 1.19 $ * - * Last update: $Date: 2005/08/12 16:20:01 $ - * by : $Author: thimel $ + * Last update: $Date: 2005/08/19 14:52:47 $ + * by : $Author: bpoussin $ */ package org.codelutin.topia.persistence; @@ -205,12 +205,12 @@ SQL_ORACLE.put(SQL_CREATE_TABLE_DATA, "CREATE TABLE data (id varchar(100), longdate number(21), field varchar(100), value blob, type varchar(255), constraint data_pk PRIMARY KEY (id, longdate, field))"); SQL_ORACLE.put(SQL_GET_ALL_ID, - "SELECT DISTINCT(id) FROM management WHERE (longdate in (" + Util.SQL_IDS_KEY + ") OR (longdate>0 AND longdate<=?)) AND id NOT IN (SELECT id FROM management WHERE isDeleted=0 AND (longdate in (" + Util.SQL_IDS_KEY + ") OR (longdate>0 AND longdate<=?)))"); + "SELECT DISTINCT(id) FROM management WHERE (longdate in (" + Util.SQL_IDS_KEY + ") OR (longdate>0 AND longdate<=?)) AND id NOT IN (SELECT id FROM management WHERE isDeleted=0 AND (longdate in (" + Util.SQL_IDS_KEY + ") OR (longdate>0 AND longdate<=?)))"); - SQL_DERBY.put(SQL_CREATE_TABLE_MANAGEMENT, - "CREATE TABLE management (id VARCHAR(100), longdate bigint, class LONG VARCHAR, isNew integer, isDeleted integer, schemaVersion bigint, PRIMARY KEY (id, longdate))"); + SQL_DERBY.put(SQL_CREATE_TABLE_MANAGEMENT, + "CREATE TABLE management (id VARCHAR(100), longdate bigint, class LONG VARCHAR, isNew integer, isDeleted integer, schemaVersion bigint, PRIMARY KEY (id, longdate))"); SQL_DERBY.put(SQL_CREATE_TABLE_DATA, - "CREATE TABLE data (id varchar(100), longdate bigint, field varchar(100), value blob, type LONG VARCHAR, PRIMARY KEY (id, longdate, field))"); + "CREATE TABLE data (id varchar(100), longdate bigint, field varchar(100), value blob, type LONG VARCHAR, PRIMARY KEY (id, longdate, field))"); SQL_DERBY.put(SQL_GET_ALL_ID, "SELECT DISTINCT(id) FROM management WHERE (longdate in (" + Util.SQL_IDS_KEY + ") OR (longdate>0 AND longdate<=?)) AND id NOT IN (SELECT id FROM management WHERE isDeleted=0 AND (longdate in (" + Util.SQL_IDS_KEY + ") OR (longdate>0 AND longdate<=?)))"); @@ -927,7 +927,7 @@ conn.close(); } } catch (SQLException eee) { - throw new TopiaPersistenceException("Erreur durant le find transaction : " + context.getTransaction().getId(), eee); + throw new TopiaPersistenceException("Erreur durant le find transaction : " + context.getTransaction().getId() + " query: "+ preparedQuery, eee); } } catch (QueryHelperException eee) { throw new TopiaPersistenceException("Execution de la requete impossible, requete source mal formée", eee);