Fixed some issues with MySQL and SQL Server backends and improved the…

… compiler method for IdentifierExpression.
weavejester · Apr 18, 2011 · 2a84f86 · 2a84f86
1 parent 42eb257
commit 2a84f86
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/lobos/backends/mysql.clj b/src/lobos/backends/mysql.clj
@@ -69,10 +69,12 @@
 
 ;; ## Compiler
 
-(defmethod compile [::standard IdentifierExpression]
+(defmethod compile [:mysql IdentifierExpression]
   [identifier]
   (let [{:keys [db-spec name qualifiers]} identifier]
-    (join* \. (map #(as-str \` % \`) (concat qualifiers name)))))
+    (join* \. (->> (concat qualifiers [name])
+                   (filter identity)
+                   (map #(when % (as-str \` % \`)))))))
 
 (defvar- compiler-data-type-aliases
   {:clob :text

diff --git a/src/lobos/backends/sqlserver.clj b/src/lobos/backends/sqlserver.clj
@@ -66,10 +66,12 @@
 
 ;; ## Compiler
 
-(defmethod compile [::standard IdentifierExpression]
+(defmethod compile [:sqlserver IdentifierExpression]
   [identifier]
   (let [{:keys [db-spec name qualifiers]} identifier]
-    (join* \. (map #(as-str \[ % \]) (concat qualifiers name)))))
+    (join* \. (->> (concat qualifiers [name])
+                   (filter identity)
+                   (map #(when % (as-str \[ % \])))))))
 
 (defmethod compile [:sqlserver FunctionExpression]
   [function]
@@ -106,21 +108,23 @@
   [_]
   "IDENTITY")
 
-(defn- drop-schema-cascade [db-spec oname]
+(defn- drop-schema-cascade [db-spec sname]
   (vec (for [element (with-db-meta db-spec
-                       (-> (analyze-schema oname) :elements keys))]
+                       (-> (analyze-schema sname) :elements keys))]
          (compile (schema/build-drop-statement
                    (schema/table element)
                    :cascade
-                   (assoc db-spec :schema oname))))))
+                   (assoc db-spec :schema sname))))))
 
 (defmethod compile [:sqlserver DropStatement]
   [statement]
   (let [{:keys [db-spec otype oname behavior options]} statement
         sql-string (join \space
                      "DROP"
                      (as-sql-keyword otype)
-                     (as-identifier db-spec oname (:schema db-spec)))]
+                     (as-identifier db-spec oname
+                                    (when (not= otype :schema)
+                                      (:schema db-spec))))]
     (if (= otype :index)
       (join \space
         "DROP INDEX"

diff --git a/src/lobos/compiler.clj b/src/lobos/compiler.clj
@@ -124,8 +124,9 @@
 (defmethod compile [::standard IdentifierExpression]
   [identifier]
   (let [{:keys [db-spec name qualifiers]} identifier]
-    (join* \. (map #(when % (as-str \" % \"))
-                   (concat qualifiers [name])))))
+    (join* \. (->> (concat qualifiers [name])
+                   (filter identity)
+                   (map #(when % (as-str \" % \")))))))
 
 (defmethod compile [::standard FunctionExpression]
   [function]