No commit message

landawn · Nov 8, 2021 · 533ea70 · 533ea70
1 parent 00168cd
commit 533ea70
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 77 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+## 1.1
+
+* Improvements
+
+
 ## 1.0
 
 * A new start

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 * Gradle:
 ```gradle
 // JDK 1.8 or above:
-compile 'com.landawn:abacus-query:1.0'
+compile 'com.landawn:abacus-query:1.1'
 ```
 
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.landawn</groupId>
 	<artifactId>abacus-query</artifactId>
-	<version>1.0</version>
+	<version>1.1</version>
 	<packaging>jar</packaging>
 
 	<name>abacus-query</name>
@@ -25,14 +25,7 @@
 			<artifactId>abacus-common</artifactId>
             <version>2.7</version>
 			<scope>provided</scope>
-		</dependency>
-
-        <dependency>
-            <groupId>com.landawn</groupId>
-            <artifactId>abacus-jdbc</artifactId>
-            <version>2.9</version>
-            <scope>provided</scope>
-        </dependency>
+		</dependency> 
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>

diff --git a/src/main/java/com/landawn/abacus/util/SQLBuilder.java b/src/main/java/com/landawn/abacus/util/SQLBuilder.java
@@ -2480,73 +2480,6 @@ public <E extends Exception> void accept(final Throwables.BiConsumer<? super Str
         consumer.accept(sp.sql, sp.parameters);
     }
 
-    private static final Set<?> namedSQLBuilderClasses = N.asSet(NSB.class, NSC.class, NAC.class, NLC.class);
-
-    @SuppressWarnings("rawtypes")
-    @Beta
-    public com.landawn.abacus.util.AbstractPreparedQuery toPreparedQuery(final javax.sql.DataSource ds) throws java.sql.SQLException {
-        final SP sp = this.pair();
-
-        if (namedSQLBuilderClasses.contains(this.getClass())) {
-            return com.landawn.abacus.util.JdbcUtil.prepareNamedQuery(ds, sp.sql).setParameters(sp.parameters);
-        }
-        return com.landawn.abacus.util.JdbcUtil.prepareQuery(ds, sp.sql).setParameters(sp.parameters);
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Beta
-    public com.landawn.abacus.util.AbstractPreparedQuery toPreparedQuery(final java.sql.Connection conn) throws java.sql.SQLException {
-        final SP sp = this.pair();
-
-        if (namedSQLBuilderClasses.contains(this.getClass())) {
-            return com.landawn.abacus.util.JdbcUtil.prepareNamedQuery(conn, sp.sql).setParameters(sp.parameters);
-        }
-        return com.landawn.abacus.util.JdbcUtil.prepareQuery(conn, sp.sql).setParameters(sp.parameters);
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Beta
-    public <Q extends com.landawn.abacus.util.AbstractPreparedQuery> Q toPreparedQuery(final Throwables.Function<SP, Q, java.sql.SQLException> func)
-            throws java.sql.SQLException {
-        final SP sp = this.pair();
-
-        return func.apply(sp);
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Beta
-    public <Q extends com.landawn.abacus.util.AbstractPreparedQuery> Q toPreparedQuery(
-            final Throwables.BiFunction<? super String, ? super List<Object>, Q, java.sql.SQLException> func) throws java.sql.SQLException {
-        final SP sp = this.pair();
-
-        return func.apply(sp.sql, sp.parameters);
-    }
-
-    @Beta
-    public com.landawn.abacus.util.NamedQuery toNamedQuery(final javax.sql.DataSource ds) throws java.sql.SQLException {
-        requiresNamedSQLBuilder();
-
-        final SP sp = this.pair();
-
-        return com.landawn.abacus.util.JdbcUtil.prepareNamedQuery(ds, sp.sql).setParameters(sp.parameters);
-    }
-
-    @Beta
-    public com.landawn.abacus.util.NamedQuery toNamedQuery(final java.sql.Connection conn) throws java.sql.SQLException {
-        requiresNamedSQLBuilder();
-
-        final SP sp = this.pair();
-
-        return com.landawn.abacus.util.JdbcUtil.prepareNamedQuery(conn, sp.sql).setParameters(sp.parameters);
-    }
-
-    private void requiresNamedSQLBuilder() {
-        if (!namedSQLBuilderClasses.contains(this.getClass())) {
-            throw new RuntimeException(
-                    "NamedQuery must be created from named SQLBuilder: NSB/NSC/NAC/NLC. But this SQLBuilder: " + this.getClass() + " is not named SQLBuilder");
-        }
-    }
-
     /**
      *
      * @param setForUpdate