| |
@@ -21,8 +21,7 @@ |
| 21 |
21 |
|
WhereClause pSelectionWhereClause ) |
| 22 |
22 |
|
throws DBException |
| 23 |
23 |
|
{ |
| 24 |
|
- |
String whereClause = |
| 25 |
|
- |
SQL_OR_Helper.toSQL( pIncludingImmortalInactives, pMetaDataForPO, pSelectionWhereClause ); |
| |
24 |
+ |
String whereClause = SQL_OR_Helper.toSQL( pIncludingImmortalInactives, pMetaDataForPO, pSelectionWhereClause ); |
| 26 |
25 |
|
return rawCount( pMetaDataForPO.getTableName(), whereClause ); |
| 27 |
26 |
|
} |
| 28 |
27 |
|
|
| |
@@ -51,14 +50,12 @@ |
| 51 |
50 |
|
{ |
| 52 |
51 |
|
String selectColumns = SQL_OR_Helper.buildAllSelectColumns( pMetaDataForPO ); |
| 53 |
52 |
|
String tableName = pMetaDataForPO.getTableName(); |
| 54 |
|
- |
String wc = |
| 55 |
|
- |
SQL_OR_Helper.toSQL( pIncludingImmortalInactives, pMetaDataForPO, pSelectionWhereClause ); |
| |
53 |
+ |
String wc = SQL_OR_Helper.toSQL( pIncludingImmortalInactives, pMetaDataForPO, pSelectionWhereClause ); |
| 56 |
54 |
|
String orderBy = SQL_OR_Helper.toSQL( pMetaDataForPO, pOrderBy ); |
| 57 |
55 |
|
String zCmd = getHelper().buildQuery( zDBconnection.getDBinfo().getProductVersion(), // |
| 58 |
56 |
|
tableName, selectColumns, wc, orderBy, pOffset, pLimit ); |
| 59 |
57 |
|
|
| 60 |
|
- |
return new SQLORPersistenceHelper.MyPOQueryIterator( pMetaDataForPO, pFinder, this, zCmd, |
| 61 |
|
- |
zDBconnection ); |
| |
58 |
+ |
return new SQLORPersistenceHelper.MyPOQueryIterator( pMetaDataForPO, pFinder, this, zCmd, zDBconnection ); |
| 62 |
59 |
|
} |
| 63 |
60 |
|
catch ( DBException e ) |
| 64 |
61 |
|
{ |
| |
@@ -74,27 +71,23 @@ |
| 74 |
71 |
|
WhereClause pSelectionWhereClause, OrderBy pOrderBy ) |
| 75 |
72 |
|
throws DBException |
| 76 |
73 |
|
{ |
| 77 |
|
- |
return new SQLORPersistenceHelper.MyPOQueryIterator( pMetaDataForPO, pFinder, pPOQueryFilter, this, |
| 78 |
|
- |
SQL_OR_Helper.buildQuery( |
| 79 |
|
- |
pIncludingImmortalInactives, // |
| 80 |
|
- |
pMetaDataForPO, // |
| 81 |
|
- |
pSelectionWhereClause, pOrderBy ) ); |
| |
74 |
+ |
return new SQLORPersistenceHelper.MyPOQueryIterator( pMetaDataForPO, pFinder, pPOQueryFilter, this, SQL_OR_Helper.buildQuery( pIncludingImmortalInactives, // |
| |
75 |
+ |
pMetaDataForPO, // |
| |
76 |
+ |
pSelectionWhereClause, pOrderBy ) ); |
| 82 |
77 |
|
} |
| 83 |
78 |
|
|
| 84 |
79 |
|
@Override |
| 85 |
80 |
|
public POKeyIterator findAllKeysCursored( POKeyQueryFilter pPOKeyQueryFilter, // |
| 86 |
81 |
|
boolean pIncludingImmortalInactives, // |
| 87 |
82 |
|
MetaDataForPOinternalExtension pMetaDataForPO, // |
| 88 |
|
- |
SimpleColumnDefinition pKeyColumn, |
| 89 |
|
- |
WhereClause pSelectionWhereClause, OrderBy pOrderBy ) |
| |
83 |
+ |
SimpleColumnDefinition pKeyColumn, WhereClause pSelectionWhereClause, OrderBy pOrderBy ) |
| 90 |
84 |
|
throws DBException |
| 91 |
85 |
|
{ |
| 92 |
86 |
|
return new SQLORPersistenceHelper.MyPOKeyIterator( pPOKeyQueryFilter, this, // |
| 93 |
|
- |
SQL_OR_Helper.buildQuery( |
| 94 |
|
- |
pIncludingImmortalInactives, // |
| 95 |
|
- |
pMetaDataForPO, pKeyColumn.getColumnName(), |
| 96 |
|
- |
// |
| 97 |
|
- |
pSelectionWhereClause, pOrderBy ) ); |
| |
87 |
+ |
SQL_OR_Helper.buildQuery( pIncludingImmortalInactives, // |
| |
88 |
+ |
pMetaDataForPO, pKeyColumn.getColumnName(), |
| |
89 |
+ |
// |
| |
90 |
+ |
pSelectionWhereClause, pOrderBy ) ); |
| 98 |
91 |
|
} |
| 99 |
92 |
|
|
| 100 |
93 |
|
@Override |
| |
@@ -146,8 +139,7 @@ |
| 146 |
139 |
|
// ORPersistenceHelper ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 147 |
140 |
|
|
| 148 |
141 |
|
@SuppressWarnings({"unchecked"}) |
| 149 |
|
- |
protected WhereClause createVersionAwareWhereClause( MetaDataForPO pMetaDataForPO, |
| 150 |
|
- |
PersistentObjectImpl pPersistentObject ) |
| |
142 |
+ |
protected WhereClause createVersionAwareWhereClause( MetaDataForPO pMetaDataForPO, PersistentObjectImpl pPersistentObject ) |
| 151 |
143 |
|
{ |
| 152 |
144 |
|
WhereClause wc = pPersistentObject.getPersistentObjectUniqueKey().convertToWC(); |
| 153 |
145 |
|
if ( pMetaDataForPO.isRecordVersionable() ) |
| |
@@ -182,8 +174,7 @@ |
| 182 |
174 |
|
AttributeAccessorKeySet keySet = pMetaDataForPO.getKeySet(); |
| 183 |
175 |
|
if ( keySet != null ) |
| 184 |
176 |
|
{ |
| 185 |
|
- |
cmd.append( ", CONSTRAINT " ).append( pMetaDataForPO.getTableName() ).append( |
| 186 |
|
- |
"_PK PRIMARY KEY (" ).append( keySet.getColumns() ).append( ")" ); |
| |
177 |
+ |
cmd.append( ", CONSTRAINT " ).append( pMetaDataForPO.getTableName() ).append( "_PK PRIMARY KEY (" ).append( keySet.getColumns() ).append( ")" ); |
| 187 |
178 |
|
} |
| 188 |
179 |
|
cmd.append( " )" ); |
| 189 |
180 |
|
|
| |
@@ -205,33 +196,26 @@ |
| 205 |
196 |
|
|
| 206 |
197 |
|
private static class MyPOQueryIterator extends AbstractRowSourcePOQueryIterator<PersistentObject> |
| 207 |
198 |
|
{ |
| 208 |
|
- |
public MyPOQueryIterator( MetaDataForPOinternalExtension pMetaDataForPO, Finder pFinder, |
| 209 |
|
- |
POQueryFilter pPOQueryFilter, SQLPersistenceHelper pPersistenceHelper, |
| 210 |
|
- |
String pCmd ) |
| |
199 |
+ |
public MyPOQueryIterator( MetaDataForPOinternalExtension pMetaDataForPO, Finder pFinder, POQueryFilter pPOQueryFilter, SQLPersistenceHelper pPersistenceHelper, String pCmd ) |
| 211 |
200 |
|
{ |
| 212 |
201 |
|
this( pMetaDataForPO, pFinder, pPOQueryFilter, pPersistenceHelper, pCmd, null ); |
| 213 |
202 |
|
} |
| 214 |
203 |
|
|
| 215 |
204 |
|
public MyPOQueryIterator( MetaDataForPOinternalExtension pMetaDataForPO, Finder pFinder, // |
| 216 |
|
- |
SQLPersistenceHelper pPersistenceHelper, String pCmd, |
| 217 |
|
- |
DBconnection pDBconnection ) |
| |
205 |
+ |
SQLPersistenceHelper pPersistenceHelper, String pCmd, DBconnection pDBconnection ) |
| 218 |
206 |
|
{ |
| 219 |
207 |
|
this( pMetaDataForPO, pFinder, null, pPersistenceHelper, pCmd, pDBconnection ); |
| 220 |
208 |
|
} |
| 221 |
209 |
|
|
| 222 |
|
- |
private MyPOQueryIterator( MetaDataForPOinternalExtension pMetaDataForPO, Finder pFinder, |
| 223 |
|
- |
POQueryFilter pPOQueryFilter, SQLPersistenceHelper pPersistenceHelper, |
| 224 |
|
- |
String pCmd, DBconnection pDBconnection ) |
| |
210 |
+ |
private MyPOQueryIterator( MetaDataForPOinternalExtension pMetaDataForPO, Finder pFinder, POQueryFilter pPOQueryFilter, SQLPersistenceHelper pPersistenceHelper, String pCmd, DBconnection pDBconnection ) |
| 225 |
211 |
|
{ |
| 226 |
|
- |
super( pMetaDataForPO, pFinder, pPOQueryFilter, |
| 227 |
|
- |
new MyRowSource( pPersistenceHelper, pCmd, pDBconnection ) ); |
| |
212 |
+ |
super( pMetaDataForPO, pFinder, pPOQueryFilter, new MyRowSource( pPersistenceHelper, pCmd, pDBconnection ) ); |
| 228 |
213 |
|
} |
| 229 |
214 |
|
} |
| 230 |
215 |
|
|
| 231 |
216 |
|
private static class MyPOKeyIterator extends AbstractPOKeyIterator |
| 232 |
217 |
|
{ |
| 233 |
|
- |
public MyPOKeyIterator( POKeyQueryFilter pPOKeyQueryFilter, SQLPersistenceHelper pPersistenceHelper, |
| 234 |
|
- |
String pCmd ) |
| |
218 |
+ |
public MyPOKeyIterator( POKeyQueryFilter pPOKeyQueryFilter, SQLPersistenceHelper pPersistenceHelper, String pCmd ) |
| 235 |
219 |
|
{ |
| 236 |
220 |
|
super( pPOKeyQueryFilter, new MyRowSource( pPersistenceHelper, pCmd, null ) ); |
| 237 |
221 |
|
} |
View this file contents
View the full history
Commits for