openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wisnes...@apache.org
Subject svn commit: r552039 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: kernel/AbstractUpdateManager.java kernel/PreparedStatementManagerImpl.java sql/OracleDictionary.java sql/SelectImpl.java
Date Fri, 29 Jun 2007 21:22:02 GMT
Author: wisneskid
Date: Fri Jun 29 14:22:01 2007
New Revision: 552039

URL: http://svn.apache.org/viewvc?view=rev&rev=552039
Log:
OPENJPA-266, committing the patch.

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java?view=diff&rev=552039&r1=552038&r2=552039
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
(original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
Fri Jun 29 14:22:01 2007
@@ -136,7 +136,7 @@
      * @param customs buffer custom mappings
      * @return the exceptions list
      */
-    private Collection populateRowManager(OpenJPAStateManager sm,
+    protected Collection populateRowManager(OpenJPAStateManager sm,
         RowManager rowMgr, JDBCStore store, Collection exceps,
         Collection customs) {
         try {
@@ -336,7 +336,7 @@
     /**
      * Executes customized mapping updates.
      */
-    private static class CustomMapping {
+    protected static class CustomMapping {
 
         public static final int INSERT = 0;
         public static final int UPDATE = 1;

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java?view=diff&rev=552039&r1=552038&r2=552039
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
(original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
Fri Jun 29 14:22:01 2007
@@ -79,7 +79,7 @@
     /**
      * 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
         Column[] autoAssign = null;
         if (row.getAction() == Row.ACTION_INSERT)

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java?view=diff&rev=552039&r1=552038&r2=552039
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
(original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
Fri Jun 29 14:22:01 2007
@@ -912,7 +912,7 @@
     /**
      * 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();
         return makeNameValid("SEQ_" + table.getName(), table.getSchema().
             getSchemaGroup(), maxTableNameLength, NAME_ANY);
@@ -921,7 +921,7 @@
     /**
      * 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();
         return makeNameValid("TRIG_" + table.getName(), table.getSchema().
             getSchemaGroup(), maxTableNameLength, NAME_ANY);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java?view=diff&rev=552039&r1=552038&r2=552039
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java Fri
Jun 29 14:22:01 2007
@@ -122,7 +122,7 @@
     private SortedMap _tables = null;
 
     // 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;
 
     // flags
@@ -158,7 +158,7 @@
 
     // from select if this select selects from a tmp table created by another
     private SelectImpl _from = null;
-    private SelectImpl _outer = null;
+    protected SelectImpl _outer = null;
     
     // bitSet indicating if an alias is removed from parent select
     // bit 0 : correspond to alias 0
@@ -2670,20 +2670,24 @@
             return super.toString() + " (" + _outer + "): " + _joins;
         }
     }
+    
+    protected Selects newSelects() {
+        return new Selects();
+    }
 
     /**
      * Helper class to track selected columns, with fast contains method.
      * Acts as a list of select ids, with additional methods to manipulate
      * the alias of each selected id.
      */
-    private static class Selects
+    protected static class Selects
         extends AbstractList {
 
-        private List _ids = null;
-        private List _idents = null;
-        private Map _aliases = null;
-        private Map _selectAs = null;
-        private DBDictionary _dict = null;
+        protected List _ids = null;
+        protected List _idents = null;
+        protected Map _aliases = null;
+        protected Map _selectAs = null;
+        protected DBDictionary _dict = null;
 
         /**
          * Add all aliases from another instance.



Mime
View raw message