cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1449462 [3/3] - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/access/ main/java/org/apache/cayenne/access/jdbc/ main/java/org/apache/cayenne/access/trans/ main/java/org/apache/cayenne/dba/ ma...
Date Sun, 24 Feb 2013 11:53:38 GMT
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java?rev=1449462&r1=1449461&r2=1449462&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
Sun Feb 24 11:53:37 2013
@@ -46,15 +46,15 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Defines API and a common superclass for testing various database features. Different
- * databases support different feature sets that need to be tested differently. Many
- * things implemented in subclasses may become future candidates for inclusion in the
- * corresponding adapter code.
+ * Defines API and a common superclass for testing various database features.
+ * Different databases support different feature sets that need to be tested
+ * differently. Many things implemented in subclasses may become future
+ * candidates for inclusion in the corresponding adapter code.
  */
 public class UnitDbAdapter {
 
     private static Log logger = LogFactory.getLog(UnitDbAdapter.class);
-    
+
     @Inject
     protected RuntimeProperties runtimeProperties;
 
@@ -70,21 +70,12 @@ public class UnitDbAdapter {
     /**
      * Drops all table constraints.
      */
-    public void willDropTables(
-            Connection conn,
-            DataMap map,
-            Collection<String> tablesToDrop) throws Exception {
+    public void willDropTables(Connection conn, DataMap map, Collection<String> tablesToDrop)
throws Exception {
         dropConstraints(conn, map, tablesToDrop);
     }
 
-    protected void dropConstraints(
-            Connection conn,
-            DataMap map,
-            Collection<String> tablesToDrop) throws Exception {
-        Map<String, Collection<String>> constraintsMap = getConstraints(
-                conn,
-                map,
-                tablesToDrop);
+    protected void dropConstraints(Connection conn, DataMap map, Collection<String>
tablesToDrop) throws Exception {
+        Map<String, Collection<String>> constraintsMap = getConstraints(conn,
map, tablesToDrop);
 
         for (Map.Entry<String, Collection<String>> entry : constraintsMap.entrySet())
{
 
@@ -98,16 +89,14 @@ public class UnitDbAdapter {
             if (entity == null) {
                 continue;
             }
-            boolean status = entity.getDataMap() != null
-                    && entity.getDataMap().isQuotingSQLIdentifiers();
-            QuotingStrategy strategy = adapter.getQuotingStrategy(status);
+
+            QuotingStrategy strategy = adapter.getQuotingStrategy();
 
             for (String constraint : constraints) {
                 StringBuilder drop = new StringBuilder();
 
-                drop.append("ALTER TABLE ").append(
-                        strategy.quotedFullyQualifiedName(entity)).append(
-                        " DROP CONSTRAINT ").append(constraint);
+                drop.append("ALTER TABLE ").append(strategy.quotedFullyQualifiedName(entity))
+                        .append(" DROP CONSTRAINT ").append(constraint);
                 executeDDL(conn, drop.toString());
             }
         }
@@ -135,16 +124,16 @@ public class UnitDbAdapter {
     }
 
     /**
-     * Returns whether the target database supports expressions in the WHERE clause in the
-     * form "VALUE = COLUMN".
+     * Returns whether the target database supports expressions in the WHERE
+     * clause in the form "VALUE = COLUMN".
      */
     public boolean supportsReverseComparison() {
         return true;
     }
 
     /**
-     * Returns whether an aggregate query like "SELECT min(X) FROM" returns a NULL row
-     * when no data matched the WHERE clause. Most DB's do.
+     * Returns whether an aggregate query like "SELECT min(X) FROM" returns a
+     * NULL row when no data matched the WHERE clause. Most DB's do.
      */
     public boolean supportNullRowForAggregateFunctions() {
         return true;
@@ -162,15 +151,16 @@ public class UnitDbAdapter {
     }
 
     /**
-     * Returns whether the DB supports a TRIM function for an arbitrary character.
+     * Returns whether the DB supports a TRIM function for an arbitrary
+     * character.
      */
     public boolean supportsTrimChar() {
         return false;
     }
 
     /**
-     * Returns false if stored procedures are not supported or if it is a victim of
-     * CAY-148 (column name capitalization).
+     * Returns false if stored procedures are not supported or if it is a victim
+     * of CAY-148 (column name capitalization).
      */
     public boolean canMakeObjectsOutOfProcedures() {
         return supportsStoredProcedures();
@@ -200,12 +190,13 @@ public class UnitDbAdapter {
     }
 
     /**
-     * Returns true if the target database has support for large objects (BLOB, CLOB).
+     * Returns true if the target database has support for large objects (BLOB,
+     * CLOB).
      */
     public boolean supportsLobs() {
         return false;
     }
-    
+
     public boolean supportsLobComparisons() {
         return supportsLobs();
     }
@@ -225,7 +216,7 @@ public class UnitDbAdapter {
     public boolean supportsCaseInsensitiveOrder() {
         return true;
     }
-    
+
     public boolean supportsCatalogs() {
         return false;
     }
@@ -233,7 +224,7 @@ public class UnitDbAdapter {
     public boolean supportsBatchPK() {
         return true;
     }
-    
+
     public boolean supportsBitwiseOps() {
         return false;
     }
@@ -244,28 +235,24 @@ public class UnitDbAdapter {
 
         try {
             st.execute(ddl);
-        }
-        finally {
+        } finally {
             st.close();
         }
     }
 
-    protected void executeDDL(Connection con, String database, String name)
-            throws Exception {
+    protected void executeDDL(Connection con, String database, String name) throws Exception
{
         executeDDL(con, ddlString(database, name));
     }
 
     /**
-     * Returns a file under test resources DDL directory for the specified database.
+     * Returns a file under test resources DDL directory for the specified
+     * database.
      */
     private String ddlString(String database, String name) {
         StringBuffer location = new StringBuffer();
         location.append("ddl/").append(database).append("/").append(name);
 
-        InputStream resource = Thread
-                .currentThread()
-                .getContextClassLoader()
-                .getResourceAsStream(location.toString());
+        InputStream resource = Thread.currentThread().getContextClassLoader().getResourceAsStream(location.toString());
 
         if (resource == null) {
             throw new CayenneRuntimeException("Can't find DDL file: " + location);
@@ -278,16 +265,13 @@ public class UnitDbAdapter {
             while ((line = in.readLine()) != null) {
                 buf.append(line).append('\n');
             }
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             throw new CayenneRuntimeException("Error reading DDL file: " + location);
-        }
-        finally {
+        } finally {
 
             try {
                 in.close();
-            }
-            catch (IOException e) {
+            } catch (IOException e) {
 
             }
         }
@@ -299,12 +283,10 @@ public class UnitDbAdapter {
     }
 
     /**
-     * Returns a map of database constraints with DbEntity names used as keys, and
-     * Collections of constraint names as values.
+     * Returns a map of database constraints with DbEntity names used as keys,
+     * and Collections of constraint names as values.
      */
-    protected Map<String, Collection<String>> getConstraints(
-            Connection conn,
-            DataMap map,
+    protected Map<String, Collection<String>> getConstraints(Connection conn,
DataMap map,
             Collection<String> includeTables) throws SQLException {
 
         Map<String, Collection<String>> constraintMap = new HashMap<String,
Collection<String>>();
@@ -316,13 +298,11 @@ public class UnitDbAdapter {
             if (entity == null) {
                 continue;
             }
-            boolean status = entity.getDataMap() != null
-                    && entity.getDataMap().isQuotingSQLIdentifiers();
-            QuotingStrategy strategy = adapter.getQuotingStrategy(status);
+
+            QuotingStrategy strategy = adapter.getQuotingStrategy();
 
             // Get all constraints for the table
-            ResultSet rs = metadata.getExportedKeys(entity.getCatalog(), entity
-                    .getSchema(), entity.getName());
+            ResultSet rs = metadata.getExportedKeys(entity.getCatalog(), entity.getSchema(),
entity.getName());
             try {
                 while (rs.next()) {
                     String fk = rs.getString("FK_NAME");
@@ -336,11 +316,10 @@ public class UnitDbAdapter {
                             constraintMap.put(fkTable, constraints);
                         }
 
-                        constraints.add(strategy.quotedIdentifier(fk));
+                        constraints.add(strategy.quotedIdentifier(entity, fk));
                     }
                 }
-            }
-            finally {
+            } finally {
                 rs.close();
             }
         }
@@ -348,14 +327,10 @@ public class UnitDbAdapter {
         return constraintMap;
     }
 
-    public QuotingStrategy getQuotingStrategy(boolean status) {
-        return adapter.getQuotingStrategy(status);
-    }
-
     public boolean supportsNullBoolean() {
         return true;
     }
-    
+
     public boolean supportsBoolean() {
         return true;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelper.java?rev=1449462&r1=1449461&r2=1449462&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelper.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelper.java
Sun Feb 24 11:53:37 2013
@@ -21,6 +21,7 @@ package org.apache.cayenne.unit.di.serve
 import javax.sql.DataSource;
 
 import org.apache.cayenne.dba.QuotingStrategy;
+import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.test.jdbc.DBHelper;
 
 /**
@@ -28,16 +29,18 @@ import org.apache.cayenne.test.jdbc.DBHe
  */
 public class FlavoredDBHelper extends DBHelper {
 
-    protected QuotingStrategy quotingStrategy;
+    private QuotingStrategy quotingStrategy;
+    private DataMap dataMap;
 
-    public FlavoredDBHelper(DataSource dataSource, QuotingStrategy quotingStrategy) {
+    public FlavoredDBHelper(DataSource dataSource, QuotingStrategy quotingStrategy, DataMap
dataMap) {
         super(dataSource);
+        this.dataMap = dataMap;
         this.quotingStrategy = quotingStrategy;
     }
 
     @Override
     protected String quote(String sqlIdentifier) {
-        return quotingStrategy.quotedIdentifier(sqlIdentifier);
+        return quotingStrategy.quotedIdentifier(dataMap, sqlIdentifier);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelperProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelperProvider.java?rev=1449462&r1=1449461&r2=1449462&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelperProvider.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/FlavoredDBHelperProvider.java
Sun Feb 24 11:53:37 2013
@@ -33,17 +33,16 @@ public class FlavoredDBHelperProvider im
     protected ServerCaseDataSourceFactory dataSourceFactory;
 
     @Inject
-    // injecting provider to make this provider independent from scoping of ServerRuntime
+    // injecting provider to make this provider independent from scoping of
+    // ServerRuntime
     protected Provider<ServerRuntime> serverRuntimeProvider;
 
     @Inject
     protected DbAdapter adapter;
 
     public DBHelper get() throws ConfigurationException {
-
         DataChannel channel = serverRuntimeProvider.get().getChannel();
         DataMap firstMap = channel.getEntityResolver().getDataMaps().iterator().next();
-        return new FlavoredDBHelper(dataSourceFactory.getSharedDataSource(),
-                adapter.getQuotingStrategy(firstMap.isQuotingSQLIdentifiers()));
+        return new FlavoredDBHelper(dataSourceFactory.getSharedDataSource(), adapter.getQuotingStrategy(),
firstMap);
     }
 }



Mime
View raw message