[#191] Fix use of a single statement for a chain of SQL queries

Author: kostafey

src/ejc_sql/connect.clj

@@ -154,50 +154,59 @@ SELECT * FROM urls WHERE path like '%http://localhost%'"
 
 (defn eval-sql-core
   "The core SQL evaluation function."
-  [& {:keys [db sql fetch-size max-rows]
+  [& {:keys [db sql-list fetch-size max-rows]
       :or {db @ejc-sql.connect/db}}]
   (set-db db)
   (java.util.Locale/setDefault (java.util.Locale. "UK"))
   (try
-    (if (select? sql)
-      (list
-       :result-set
-       (with-open [conn (j/get-connection db)]
-         (let [stmt (j/prepare-statement
-                     conn sql
-                     {:fetch-size (or fetch-size @o/fetch-size 0)
-                      :max-rows (or max-rows
-                                    (if (and (> @o/max-rows 0)
-                                             @o/show-too-many-rows-message)
-                                      ;; Get one more row to recognize that
-                                      ;; the actual number of records from this
-                                      ;; query is bigger than `max-rows`.
-                                      (+ @o/max-rows 1)
-                                      @o/max-rows)
-                                    0)})]
-           (swap! current-query assoc
-                  :stmt stmt
-                  :conn conn)
-           (j/query db stmt
-                    {:as-arrays? true
-                     :result-set-fn
-                     (fn [rs]
-                       (let [single-record?
-                             (not (next (next rs)))]
-                         (mapv
-                          #(clob-to-string-row
-                            % single-record?)
-                          rs)))}))))
-      (let [result (first (j/execute! db (list sql)))
-            msg (if (> result 0)
-                  (str "Records affected: " result)
-                  "Executed")]
-        (when (ddl? sql)
-          (invalidate-cache db))
-        (list :message msg)))
+    (with-open [conn (j/get-connection db)]
+      (let [statement (.createStatement conn)]
+        (mapv (fn [sql]
+                (if (select? sql)
+                  ;; SELECT
+                  (list
+                   :result-set
+                   (let [stmt (j/prepare-statement
+                               conn sql
+                               {:fetch-size (or fetch-size @o/fetch-size 0)
+                                :max-rows (or max-rows
+                                              (if (and (> @o/max-rows 0)
+                                                       @o/show-too-many-rows-message)
+                                                ;; Get one more row to recognize that
+                                                ;; the actual number of records from this
+                                                ;; query is bigger than `max-rows`.
+                                                (+ @o/max-rows 1)
+                                                @o/max-rows)
+                                              0)})]
+                     (swap! current-query assoc
+                            :stmt stmt
+                            :conn conn)
+                     (j/query db stmt
+                              {:as-arrays? true
+                               :result-set-fn
+                               (fn [rs]
+                                 (let [single-record?
+                                       (not (next (next rs)))]
+                                   (mapv
+                                    #(clob-to-string-row
+                                      % single-record?)
+                                    rs)))})))
+                  ;; DML or DDL
+                  (let [result-set? (.execute statement sql)
+                        message (if-let [result (when
+                                                 (and
+                                                  (not result-set?)
+                                                  (> (.getUpdateCount statement) 0))
+                                                  (.getUpdateCount statement))]
+                                  (str "Records affected: " result)
+                                  "Executed")]
+                    (when (ddl? sql)
+                      (invalidate-cache db))
+                    (list :message message))))
+              sql-list)))
     (catch SQLException e
-      (list :message
-            (o/unify-str "Error: " (.getMessage e))))))
+      [(list :message
+             (o/unify-str "Error: " (.getMessage e)))])))
 
 (defn- eval-user-sql
   "Receive raw SQL from the user, log it, divide by statements and eval them."
@@ -219,23 +228,24 @@ SELECT * FROM urls WHERE path like '%http://localhost%'"
                              [sql nil])
         sql (handle-special-cases db sql)
         statement-separator-re (get-separator-re (or manual-separator ";"))
-        results (doall
-                 (for [sql-part (filter
+        results (let [sql-parts (filter
                                  ;; Remove parts contains comments only.
                                  (fn [part]
                                    (seq (s/trim
                                          (s/replace part comments-re ""))))
                                  (if (or (not (:separator db)) manual-separator)
                                    (s/split sql statement-separator-re)
-                                   [sql]))]
-                   (let [[result-type result] (eval-sql-core :db db
-                                                             :sql sql-part
-                                                             :max-rows rows-limit
-                                                             :fetch-size fetch-size)]
-                     (if (= result-type :result-set)
-                       (o/print-table result fetch-size)
-                       (println result))
-                     [result-type result])))]
+                                   [sql]))
+                      result-list (eval-sql-core :db db
+                                                 :sql-list sql-parts
+                                                 :max-rows rows-limit
+                                                 :fetch-size fetch-size)
+                      _ (doall
+                         (for [[result-type result] result-list]
+                           (if (= result-type :result-set)
+                             (o/print-table result fetch-size)
+                             (println result))))]
+                  result-list)]
     (complete
      nil
      :start-time (:start-time @current-query)

src/ejc_sql/structure.clj

@@ -1170,10 +1170,12 @@
           (println)
           (println "Constraints:")
           (println)
-          (o/print-table (second (c/eval-sql-core :db db
-                                                  :sql sql
-                                                  :fetch-size 0
-                                                  :max-rows 0)))))))
+          (o/print-table (second
+                          (first
+                           (c/eval-sql-core :db db
+                                            :sql-list (list sql)
+                                            :fetch-size 0
+                                            :max-rows 0))))))))
   (c/complete
    nil
    :display-result true