From fda24b24a1ebf712b257770f1af11f079d24e034 Mon Sep 17 00:00:00 2001
From: Matt Oquist <moquist@majen.net>
Date: Tue, 5 Nov 2013 16:34:12 -0500
Subject: [PATCH 1/2] Add ddl/create-primary-key and ddl/create-foreign-key

---
 src/main/clojure/clojure/java/jdbc/ddl.clj | 37 ++++++++++++++++++++++
 src/main/clojure/clojure/java/jdbc/sql.clj |  4 ++-
 src/test/clojure/clojure/java/test_ddl.clj | 12 +++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/java/jdbc/ddl.clj b/src/main/clojure/clojure/java/jdbc/ddl.clj
index 2c359c2a..aa029f65 100644
--- a/src/main/clojure/clojure/java/jdbc/ddl.clj
+++ b/src/main/clojure/clojure/java/jdbc/ddl.clj
@@ -81,3 +81,40 @@ not very sophisticated." }
   [name & {:keys [entities] :or {entities sql/as-is}}]
   (format "DROP INDEX %s" (sql/as-str entities name)))
 
+(defn create-primary-key
+  "Given a table name and a vector of column names, return the DDL
+   string for creating a primary key.
+
+   Example:
+   (create-primary-key :tablename [:field1 :field2])
+   \"ALTER TABLE tablename ADD PRIMARY KEY (field1, field2)\""
+  [table-name cols & specs]
+  (let [entities-spec (drop-while #(not= :entities %) specs)
+        {:keys [entities] :or {entities sql/as-is}} (take 2 entities-spec)
+        cols-string (apply str
+                           (interpose ", "
+                                      (map (sql/as-str entities)
+                                           cols)))]
+    (format "ALTER TABLE %s ADD PRIMARY KEY (%s)"
+            (sql/as-str entities table-name)
+            cols-string)))
+
+(defn create-foreign-key
+  "Given a foreign key spec, return the DDL string for creating the
+   foreign key.
+
+   Examples:
+   (create-foreign-key :constraint-name :tablename :field1 :reftablename :reffield1)
+   \"ALTER TABLE tablename ADD CONSTRAINT constraint-name FOREIGN KEY (field1) REFERENCES reftablename (reffield1)\"
+
+   (create-foreign-key :ConstraintName :TableName :field1 :RefTableName :reffield1 :entities sql/lower-case)
+   \"ALTER TABLE tablename ADD CONSTRAINT constraintname FOREIGN KEY (field1) REFERENCES reftablename (reffield1)\""
+  [constraint-name table-name col ref-table-name ref-col & specs]
+  (let [entities-spec (drop-while #(not= :entities %) specs)
+        {:keys [entities] :or {entities sql/as-is}} (take 2 entities-spec)]
+    (format "ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)"
+            (sql/as-str entities table-name)
+            (sql/as-str entities constraint-name)
+            (sql/as-str entities col)
+            (sql/as-str entities ref-table-name)
+            (sql/as-str entities ref-col))))
diff --git a/src/main/clojure/clojure/java/jdbc/sql.clj b/src/main/clojure/clojure/java/jdbc/sql.clj
index 4cc75f2a..9abaf73a 100644
--- a/src/main/clojure/clojure/java/jdbc/sql.clj
+++ b/src/main/clojure/clojure/java/jdbc/sql.clj
@@ -87,7 +87,9 @@ and update! high-level operations within clojure.java.jdbc directly." }
     "insert" "insert!"
     "select" "join" "where" "order-by"
     "update" "update!"
-    "create-table" "drop-table" "create-index" "drop-index"})
+    "create-table" "drop-table"
+    "create-index" "drop-index"
+    "create-primary-key" "create-foreign-key"})
 
 (def ^{:private true
        :doc "Symbols that need to be processed for identifiers within their forms."}
diff --git a/src/test/clojure/clojure/java/test_ddl.clj b/src/test/clojure/clojure/java/test_ddl.clj
index fd3b2e36..ba809b23 100644
--- a/src/test/clojure/clojure/java/test_ddl.clj
+++ b/src/test/clojure/clojure/java/test_ddl.clj
@@ -74,3 +74,15 @@
   (is (= "DROP INDEX INDEX")
       (sql/entities str/upper-case
                     (ddl/drop-index :index))))
+
+(deftest test-create-primary-key
+  (is (= "ALTER TABLE tablename ADD PRIMARY KEY (field1, field2)")
+      (ddl/create-primary-key :tablename [:field1 :field2]))
+  (is (= "ALTER TABLE \"table-name\" ADD PRIMARY KEY (\"field-1\", \"field-2\")")
+      (ddl/create-primary-key :table-name [:field-1 :field-2] :entities (sql/quoted "\""))))
+
+(deftest test-create-foreign-key
+  (is (= "ALTER TABLE tablename ADD CONSTRAINT constraintname FOREIGN KEY (field1) REFERENCES reftablename (reffield1)")
+      (ddl/create-foreign-key :constraintname :tablename :field1 :reftablename :reffield1))
+  (is (= "ALTER TABLE tablename ADD CONSTRAINT constraintname FOREIGN KEY (field1) REFERENCES reftablename (reffield1)")
+      (ddl/create-foreign-key :ConstraintName :TableName :field1 :RefTableName :reffield1 :entities sql/lower-case)))

From 0ccb6780433ac5e2b2a42751ace7d7d6eecd3720 Mon Sep 17 00:00:00 2001
From: Matt Oquist <moquist@majen.net>
Date: Wed, 6 Nov 2013 14:15:49 -0500
Subject: [PATCH 2/2] bump version for internal use until upstream patch is
 accepted

---
 pom.xml     | 162 +++++++++++++++++++++++++++++++++++++---------------
 project.clj |   2 +-
 2 files changed, 118 insertions(+), 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index 734e6734..253cebd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,75 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>java.jdbc</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-
   <parent>
-    <groupId>org.clojure</groupId>
     <artifactId>pom.contrib</artifactId>
+    <groupId>org.clojure</groupId>
     <version>0.1.2</version>
+    <relativePath/>
   </parent>
-
-  <developers>
-    <developer>
-      <name>Stephen C. Gilardi</name>
-    </developer>
-    <developer>
-      <name>Sean Corfield</name>
-    </developer>
-  </developers>
-
+  <groupId>org.clojure</groupId>
+  <artifactId>java.jdbc</artifactId>
+  <packaging>jar</packaging>
+  <version>0.3.0-SNAPSHOT</version>
+  <name>java.jdbc</name>
+  <description>A low-level Clojure wrapper for JDBC-based access to databases.</description>
+  <url>https://github.com/clojure/java.jdbc</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License</name>
+      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
   <scm>
-    <connection>scm:git:git@github.com:clojure/java.jdbc.git</connection>
-    <developerConnection>scm:git:git@github.com:clojure/java.jdbc.git</developerConnection>
-    <url>git@github.com:clojure/java.jdbc.git</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:git://github.com/moquist/java.jdbc.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/moquist/java.jdbc.git</developerConnection>
+    <tag>fda24b24a1ebf712b257770f1af11f079d24e034
+</tag>
+    <url>https://github.com/moquist/java.jdbc</url>
   </scm>
+  <build>
+    <sourceDirectory>src/main/clojure</sourceDirectory>
+    <testSourceDirectory>src/test/clojure</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>dev-resources</directory>
+      </testResource>
+      <testResource>
+        <directory>resources</directory>
+      </testResource>
+    </testResources>
+    <directory>target</directory>
+    <outputDirectory>target/classes</outputDirectory>
+  </build>
+  <repositories>
+    <repository>
+      <id>central</id>
+      <url>http://repo1.maven.org/maven2/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>clojars</id>
+      <url>https://clojars.org/repo/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>sonatype-oss-public</id>
+      <url>https://oss.sonatype.org/content/groups/public/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
   <dependencies>
-  	<dependency>
-  		<groupId>mysql</groupId>
-  		<artifactId>mysql-connector-java</artifactId>
-  		<version>5.1.25</version>
-  		<scope>test</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.derby</groupId>
-  		<artifactId>derby</artifactId>
-  		<version>10.8.1.2</version>
-  		<scope>test</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>hsqldb</groupId>
-  		<artifactId>hsqldb</artifactId>
-  		<version>1.8.0.10</version>
-  		<scope>test</scope>
-  	</dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojure</artifactId>
+      <version>1.6.0-master-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.25</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.8.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.10</version>
+    </dependency>
     <dependency>
       <groupId>postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <version>8.4-702.jdbc4</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.xerial</groupId>
       <artifactId>sqlite-jdbc</artifactId>
       <version>3.7.2</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
       <version>1.2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>tools.nrepl</artifactId>
+      <version>0.2.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.clojure</groupId>
+          <artifactId>clojure</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
-    <!-- assumes you have the Microsoft JDBC4 Driver 3.0 installed locally -->
-    <!--
     <dependency>
-      <groupId>sqljdbc4</groupId>
-      <artifactId>sqljdbc4</artifactId>
-      <version>3.0</version>
+      <groupId>clojure-complete</groupId>
+      <artifactId>clojure-complete</artifactId>
+      <version>0.2.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.clojure</groupId>
+          <artifactId>clojure</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
-    -->
   </dependencies>
 </project>
+
+<!-- This file was autogenerated by Leiningen.
+  Please do not edit it directly; instead edit project.clj and regenerate it.
+  It should not be considered canonical data. For more information see
+  https://github.com/technomancy/leiningen -->
diff --git a/project.clj b/project.clj
index be3fc44e..cb98962b 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojure/java.jdbc "0.3.0-SNAPSHOT"
+(defproject org.clojure/java.jdbc "0.3.0-SNAPSHOT4"
   :description "A low-level Clojure wrapper for JDBC-based access to databases."
   :parent [org.clojure/pom.contrib "0.1.2"]
   :url "https://github.com/clojure/java.jdbc"