refactor quirks and allow bidirectional converters

aaberg · Apr 6, 2014 · e0253ad · e0253ad · dimzon · Apr 6, 2014
1 parent 2ff6f8e
commit e0253ad
Show file tree

Hide file tree

Showing 39 changed files with 674 additions and 253 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -115,8 +115,6 @@
             <artifactId>spring-jdbc</artifactId>
             <version>4.0.2.RELEASE</version>
         </dependency>
-
-
     </dependencies>
 
     <build>

diff --git a/core/src/main/java/org/sql2o/Connection.java b/core/src/main/java/org/sql2o/Connection.java
@@ -61,9 +61,7 @@ public Sql2o getSql2o() {
     }
 
     public Query createQuery(String queryText, String name){
-        // If postgresql, the default behaviour should be not to retur generated keys, as this will throw an exception on
-        // every query that does not create any new keys.
-        boolean returnGeneratedKeys = !(this.sql2o.quirksMode == QuirksMode.PostgreSQL);
+        boolean returnGeneratedKeys = this.sql2o.getQuirks().returnGeneratedKeysByDefault();
         return createQuery(queryText, name, returnGeneratedKeys);
     }
 

diff --git a/core/src/main/java/org/sql2o/PojoResultSetIterator.java b/core/src/main/java/org/sql2o/PojoResultSetIterator.java
@@ -3,6 +3,7 @@
 import org.sql2o.converters.Convert;
 import org.sql2o.converters.Converter;
 import org.sql2o.converters.ConverterException;
+import org.sql2o.quirks.Quirks;
 import org.sql2o.reflection.Pojo;
 import org.sql2o.reflection.PojoMetadata;
 import org.sql2o.tools.ResultSetUtils;
@@ -21,8 +22,8 @@ public class PojoResultSetIterator<T> extends ResultSetIteratorBase<T> {
     private Converter converter;
     private boolean useExecuteScalar;
 
-    public PojoResultSetIterator(ResultSet rs, boolean isCaseSensitive, QuirksMode quirksMode, PojoMetadata metadata) {
-        super(rs, isCaseSensitive, quirksMode);
+    public PojoResultSetIterator(ResultSet rs, boolean isCaseSensitive, Quirks quirks, PojoMetadata metadata) {
+        super(rs, isCaseSensitive, quirks);
 
         this.metadata = metadata;
         this.converter = Convert.getConverterIfExists(metadata.getType());