Split indexed and named statement preparation

polypheny · Aug 14, 2024 · 9724e45 · 9724e45
1 parent 97b81a2
commit 9724e45
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/main/java/org/polypheny/jdbc/multimodel/PolyStatement.java b/src/main/java/org/polypheny/jdbc/multimodel/PolyStatement.java
@@ -49,7 +49,7 @@ public class PolyStatement {
 
     public PolyStatement( PolyConnection polyConnection ) {
         this.connection = polyConnection;
-        this.streamingIndex = new StreamingIndex(getPrismInterfaceClient());
+        this.streamingIndex = new StreamingIndex( getPrismInterfaceClient() );
     }
 
 
@@ -134,23 +134,23 @@ public List<Long> execute( String namespaceName, String languageName, List<Strin
     }
 
 
-    public void prepare( String namespaceName, String languageName, String statement ) throws PrismInterfaceServiceException {
+    public void prepareIndexed( String namespaceName, String languageName, String statement ) throws PrismInterfaceServiceException {
         int timeout = connection.getTimeout();
-        if ( statement.contains( "?" ) ) {
-            PreparedStatementSignature signature = getPrismInterfaceClient().prepareIndexedStatement( namespaceName, languageName, statement, timeout );
-            statementId = signature.getStatementId();
-            streamingIndex.update( statementId );
-            isPrepared = true;
-            return;
-        }
-        if ( statement.contains( ":" ) ) {
-            org.polypheny.prism.PreparedStatementSignature signature = connection.getPrismInterfaceClient().prepareNamedStatement( namespaceName, languageName, statement, timeout );
-            statementId = signature.getStatementId();
-            streamingIndex.update( statementId );
-            isPrepared = true;
-            return;
-        }
-        throw new PrismInterfaceServiceException( PrismInterfaceErrors.VALUE_ILLEGAL, "Statement must be either of the indexed or named parameterized kind." );
+
+        PreparedStatementSignature signature = getPrismInterfaceClient().prepareIndexedStatement( namespaceName, languageName, statement, timeout );
+        statementId = signature.getStatementId();
+        streamingIndex.update( statementId );
+        isPrepared = true;
+    }
+
+
+    public void prepareNamed( String namespaceName, String languageName, String statement ) throws PrismInterfaceServiceException {
+        int timeout = connection.getTimeout();
+
+        org.polypheny.prism.PreparedStatementSignature signature = connection.getPrismInterfaceClient().prepareNamedStatement( namespaceName, languageName, statement, timeout );
+        statementId = signature.getStatementId();
+        streamingIndex.update( statementId );
+        isPrepared = true;
     }