delete my contribs at their pre-SVN1088 locations

3 files changed, 0 insertions, 266 deletions

diff --git a/src/clojure/contrib/sql/internal/internal.clj b/src/clojure/contrib/sql/internal/internal.clj
deleted file mode 100644
index 6221d1e2..00000000
--- a/src/clojure/contrib/sql/internal/internal.clj
+++ /dev/null
@@ -1,43 +0,0 @@
-;;  Copyright (c) Stephen C. Gilardi. All rights reserved. The use and
-;;  distribution terms for this software are covered by the Common Public
-;;  License 1.0 (http://opensource.org/licenses/cpl.php) which can be found
-;;  in the file CPL.TXT at the root of this distribution. By using this
-;;  software in any fashion, you are agreeing to be bound by the terms of
-;;  this license. You must not remove this notice, or any other, from this
-;;  software.
-;;
-;;  internal definitions for clojure.contrib.sql
-;;
-;;  scgilardi (gmail)
-;;  Created 3 October 2008
-
-(ns clojure.contrib.sql.internal)
-
-(def *db* {:connection nil :level 0})
-
-(defn connection
-  "Returns the current database connection or throws an exception."
-  []
-  (or (:connection *db*)
-      (throw (Exception. "no current database connection"))))
-
-(defn the-str
-  "Returns the name or string representation of x"
-  [x]
-  (if (instance? clojure.lang.Named x)
-    (name x)
-    (str x)))
-
-(defn properties
-  "Converts a map from keywords or symbols to values into a
-  java.util.Properties object that maps the same keys to the values with
-  all represented as strings."
-  [m]
-  (let [p (java.util.Properties.)]
-    (when m
-      (loop [[key & keys] (keys m)
-             [val & vals] (vals m)]
-        (.setProperty p (the-str key) (the-str val))
-        (when keys
-          (recur keys vals))))
-    p))
diff --git a/src/clojure/contrib/sql/sql.clj b/src/clojure/contrib/sql/sql.clj
deleted file mode 100644
index 312a561c..00000000
--- a/src/clojure/contrib/sql/sql.clj
+++ /dev/null
@@ -1,138 +0,0 @@
-;;  Copyright (c) Stephen C. Gilardi. All rights reserved. The use and
-;;  distribution terms for this software are covered by the Common Public
-;;  License 1.0 (http://opensource.org/licenses/cpl.php) which can be found
-;;  in the file CPL.TXT at the root of this distribution. By using this
-;;  software in any fashion, you are agreeing to be bound by the terms of
-;;  this license. You must not remove this notice, or any other, from this
-;;  software.
-;;
-;;  sql.clj
-;;
-;;  A Clojure interface to sql databases via jdbc
-;;
-;;  See clojure.contrib.sql.test for an example
-;;
-;;  scgilardi (gmail)
-;;  Created 2 April 2008
-
-(ns clojure.contrib.sql
-  (:use clojure.contrib.except
-        clojure.contrib.sql.internal))
-
-(defmacro with-connection
-  "Evaluates body in the context of a new connection to a database then
-  closes it. db-spec is a map containing string values for these required
-  keys:
-    :classname     the jdbc driver class name
-    :subprotocol   the jdbc subprotocol
-    :subname       the jdbc subname
-  db-spec may contain additional key-value pairs that are passed along to
-  the driver as properties such as :user, :password, etc."
-  [db-spec & body]
-  `(do
-     (Class/forName (:classname ~db-spec))
-     (with-open con#
-         (java.sql.DriverManager/getConnection
-          (format "jdbc:%s:%s" (:subprotocol ~db-spec) (:subname ~db-spec))
-          (properties (dissoc ~db-spec :classname :subprotocol :subname)))
-       (binding [*db* (assoc *db* :connection con# :level 0)]
-         ~@body))))
-
-(defmacro transaction
-  "Evaluates body as a transaction on the open database connection. Updates
-  are committed together as a group after evaluating body or rolled back on
-  any uncaught exception. Any nested transactions will be absorbed into the
-  outermost transaction."
-  [& body]
-  `(let [con# (connection)
-         level# (:level *db*)]
-     (binding [*db* (assoc *db* :level (inc level#))]
-       (let [auto-commit# (.getAutoCommit con#)]
-         (when (zero? level#)
-           (.setAutoCommit con# false))
-         (try
-          (let [value# (do ~@body)]
-            (when (zero? level#)
-              (.commit con#))
-            value#)
-          (catch Exception e#
-            (.rollback con#)
-            (throw (Exception.
-                    (format "transaction rolled back: %s"
-                            (.getMessage e#)) e#)))
-          (finally
-           (when (zero? level#)
-             (.setAutoCommit con# auto-commit#))))))))
-
-(defn do-commands
-  "Executes SQL commands that don't return results on the open database
-  connection"
-  [& commands]
-  (with-open stmt (.createStatement (connection))
-    (doseq cmd commands
-      (.addBatch stmt cmd))
-    (.executeBatch stmt)))
-
-(defn do-prepared
-  "Executes a prepared statement on the open database connection with
-  parameter sets"
-  [sql & sets]
-  (with-open stmt (.prepareStatement (connection) sql)
-    (doseq set sets
-      (doseq [index value] (map vector (iterate inc 1) set)
-        (.setObject stmt index value))
-      (.addBatch stmt))
-    (.executeBatch stmt)))
-
-(defn create-table
-  "Creates a table on the open database connection given a name (a string
-  or keyword) and column specs. A column spec is a vector containing a name
-  and optionally a type and other items such as constraints, each a string
-  or keyword."
-  [name & column-specs]
-  (do-commands
-   (format "create table %s (%s)"
-           (the-str name)
-           (apply str
-             (map the-str
-              (apply concat
-               (interpose [", "]
-                (map (partial interpose " ") column-specs))))))))
-
-(defn drop-table
-  "Drops a table on the open database connection given its name (a string
-  or keyword)"
-  [name]
-  (do-commands
-   (format "drop table %s" (the-str name))))
-
-(defn insert-values
-  "Inserts values into columns of a table. columns is a vector of column
-  names (strings or keywords) and each value is a vector of values for
-  those columns. To insert complete rows (all columns), use insert-rows."
-  [table column-names & values]
-  (let [count (count (first values))
-        template (apply str (interpose "," (replicate count "?")))
-        columns (if (seq column-names)
-               (format "(%s)"
-                 (apply str (interpose "," (map the-str column-names))))
-               "")]
-    (apply do-prepared
-           (format "insert into %s %s values (%s)"
-                   (the-str table) columns template)
-           values)))
-
-(defn insert-rows
-  "Inserts complete rows into a table. Each row is a vector of values for
-  each of the table's columns in order."
-  [table & rows]
-  (apply insert-values table nil rows))
-
-(defmacro with-results
-  "Executes a query and then evaluates body with results bound to a seq of
-  the results"
-  [results sql & body]
-  `(with-open stmt# (.prepareStatement (connection) ~sql)
-     (with-open rset# (.executeQuery stmt#)
-       (let [~results (resultset-seq rset#)]
-         ~@body))))
diff --git a/src/clojure/contrib/sql/test/test.clj b/src/clojure/contrib/sql/test/test.clj
deleted file mode 100644
index 356cf123..00000000
--- a/src/clojure/contrib/sql/test/test.clj
+++ /dev/null
@@ -1,85 +0,0 @@
-;;  Copyright (c) Stephen C. Gilardi. All rights reserved. The use and
-;;  distribution terms for this software are covered by the Common Public
-;;  License 1.0 (http://opensource.org/licenses/cpl.php) which can be found
-;;  in the file CPL.TXT at the root of this distribution. By using this
-;;  software in any fashion, you are agreeing to be bound by the terms of
-;;  this license. You must not remove this notice, or any other, from this
-;;  software.
-;;
-;;  test.clj
-;;
-;;  test/example for clojure.contrib.sql
-;;
-;;  scgilardi (gmail)
-;;  Created 13 September 2008
-
-(ns clojure.contrib.sql.test
-  (:require [clojure.contrib.sql :as sql]))
-
-(def db {:classname "org.apache.derby.jdbc.EmbeddedDriver"
-         :subprotocol "derby"
-         :subname "/tmp/clojure.contrib.sql.test.db"
-         :create true})
-
-(defn drop-fruit []
-  (try
-   (sql/drop-table :fruit)
-   (catch Exception e)))
-
-(defn create-fruit []
-  (sql/create-table :fruit
-    [:name "varchar(32)" "NOT NULL"]
-    [:appearance "varchar(32)"]
-    [:cost :int]
-    [:grade :real]))
-
-(defn insert-rows-fruit []
-  (sql/insert-rows :fruit
-    ["Apple" "red" 59 87]
-    ["Banana" "yellow" 29 92.2]
-    ["Peach" "fuzzy" 139 90.0]
-    ["Orange" "juicy" 89 88.6]))
-
-(defn insert-values-fruit []
-  (sql/insert-values :fruit
-    [:name :cost]
-    ["Mango" 722]
-    ["Feijoa" 441]))
-
-(defn db-write []
-  (sql/with-connection db
-    (sql/transaction
-     (drop-fruit)
-     (create-fruit)
-     (insert-rows-fruit)
-     (insert-values-fruit)))
-  nil)
-
-(defn db-read []
-  (sql/with-connection db
-    (sql/with-results res
-     "select * from fruit"
-      (doseq rec res
-        (println rec)))))
-
-(defn db-read-all []
-  (sql/with-connection db
-    (sql/with-results res
-     "select * from fruit"
-      (into [] res))))
-
-(defn db-grade-a []
-  (sql/with-connection db
-    (sql/with-results res
-     "select name, cost from fruit where grade >= 90"
-      (doseq rec res
-        (println rec)))))
-
-(defn db-exception []
-  (sql/with-connection db
-    (sql/transaction
-      (sql/insert-values :fruit
-        [:name :appearance]
-        ["Grape" "yummy"]
-        ["Pear" "bruised"])
-      (throw (Exception. "an exception")))))