Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-266, committing the patch. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@552039 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David J. Wisneski 2007-06-29 21:22:01 +00:00
parent 1b9d1e2d12
commit 7db9a7fae5
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
View File

@ -136,7 +136,7 @@ public abstract class AbstractUpdateManager
* @param customs buffer custom mappings * @param customs buffer custom mappings
* @return the exceptions list * @return the exceptions list
*/ */
private Collection populateRowManager(OpenJPAStateManager sm, protected Collection populateRowManager(OpenJPAStateManager sm,
RowManager rowMgr, JDBCStore store, Collection exceps, RowManager rowMgr, JDBCStore store, Collection exceps,
Collection customs) { Collection customs) {
try { try {
@ -336,7 +336,7 @@ public abstract class AbstractUpdateManager
/** /**
* Executes customized mapping updates. * Executes customized mapping updates.
*/ */
private static class CustomMapping { protected static class CustomMapping {
public static final int INSERT = 0; public static final int INSERT = 0;
public static final int UPDATE = 1; public static final int UPDATE = 1;

2
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
View File

@ -79,7 +79,7 @@ public class PreparedStatementManagerImpl
/** /**
* Flush the given row. * Flush the given row.
*/ */
private void flushInternal(RowImpl row) throws SQLException { protected void flushInternal(RowImpl row) throws SQLException {
// can't batch rows with auto-inc columns // can't batch rows with auto-inc columns
Column[] autoAssign = null; Column[] autoAssign = null;
if (row.getAction() == Row.ACTION_INSERT) if (row.getAction() == Row.ACTION_INSERT)

4
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
View File

@ -912,7 +912,7 @@ public class OracleDictionary
/** /**
* Returns a OpenJPA 3-compatible name for an auto-assign sequence. * Returns a OpenJPA 3-compatible name for an auto-assign sequence.
*/ */
private String getOpenJPA3GeneratedKeySequenceName(Column col) { protected String getOpenJPA3GeneratedKeySequenceName(Column col) {
Table table = col.getTable(); Table table = col.getTable();
return makeNameValid("SEQ_" + table.getName(), table.getSchema(). return makeNameValid("SEQ_" + table.getName(), table.getSchema().
getSchemaGroup(), maxTableNameLength, NAME_ANY); getSchemaGroup(), maxTableNameLength, NAME_ANY);
@ -921,7 +921,7 @@ public class OracleDictionary
/** /**
* Returns a OpenJPA 3-compatible name for an auto-assign trigger. * Returns a OpenJPA 3-compatible name for an auto-assign trigger.
*/ */
private String getOpenJPA3GeneratedKeyTriggerName(Column col) { protected String getOpenJPA3GeneratedKeyTriggerName(Column col) {
Table table = col.getTable(); Table table = col.getTable();
return makeNameValid("TRIG_" + table.getName(), table.getSchema(). return makeNameValid("TRIG_" + table.getName(), table.getSchema().
getSchemaGroup(), maxTableNameLength, NAME_ANY); getSchemaGroup(), maxTableNameLength, NAME_ANY);

20
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
View File

@ -122,7 +122,7 @@ public class SelectImpl
private SortedMap _tables = null; private SortedMap _tables = null;
// combined list of selected ids and map of each id to its alias // combined list of selected ids and map of each id to its alias
private final Selects _selects = new Selects(); protected final Selects _selects = newSelects();
private List _ordered = null; private List _ordered = null;
// flags // flags
@ -158,7 +158,7 @@ public class SelectImpl
// from select if this select selects from a tmp table created by another // from select if this select selects from a tmp table created by another
private SelectImpl _from = null; private SelectImpl _from = null;
private SelectImpl _outer = null; protected SelectImpl _outer = null;
// bitSet indicating if an alias is removed from parent select // bitSet indicating if an alias is removed from parent select
// bit 0 : correspond to alias 0 // bit 0 : correspond to alias 0
@ -2671,19 +2671,23 @@ public class SelectImpl
} }
} }
protected Selects newSelects() {
return new Selects();
}
/** /**
* Helper class to track selected columns, with fast contains method. * Helper class to track selected columns, with fast contains method.
* Acts as a list of select ids, with additional methods to manipulate * Acts as a list of select ids, with additional methods to manipulate
* the alias of each selected id. * the alias of each selected id.
*/ */
private static class Selects protected static class Selects
extends AbstractList { extends AbstractList {
private List _ids = null; protected List _ids = null;
private List _idents = null; protected List _idents = null;
private Map _aliases = null; protected Map _aliases = null;
private Map _selectAs = null; protected Map _selectAs = null;
private DBDictionary _dict = null; protected DBDictionary _dict = null;
/** /**
* Add all aliases from another instance. * Add all aliases from another instance.