Test that joins come back (#20)

* Test that joins come back

* Additional test

Author: camsaul

test/toucan2/select_test.clj

@@ -12,7 +12,7 @@
    [toucan2.test :as test]
    [toucan2.tools.compile :as tools.compile])
   (:import
-   (java.time OffsetDateTime)))
+   (java.time LocalDateTime OffsetDateTime)))
 
 (set! *warn-on-reflection* true)
 
@@ -388,3 +388,38 @@
            (select/select-one ::test/venues nil)
            (select/select-one-fn :id ::test/venues nil)
            (select/select-one-fn int ::test/venues nil)))))
+
+(deftest select-join-test
+  (testing "Extra columns from joined tables should come back"
+    (is (= (instance/instance ::test/venues
+                              {:id              1
+                               :name            "bar"
+                               :category        "bar"
+                               :created-at      (LocalDateTime/parse "2017-01-01T00:00")
+                               :updated-at      (LocalDateTime/parse "2017-01-01T00:00")
+                               :slug            "bar_01"
+                               :parent-category nil})
+           (select/select-one ::test/venues
+                              {:left-join [[:category :c] [:= :venues.category :c.name]]
+                               :order-by  [[:id :asc]]})))))
+
+(derive ::venues.with-category ::test/venues)
+
+(m/defmethod query/build :after [#_query-type :toucan.query-type/select.*
+                                 #_model      ::venues.with-category
+                                 #_query      clojure.lang.IPersistentMap]
+  [_query-type _model built-query]
+  (assoc built-query :left-join [[:category :c] [:= :venues.category :c.name]]))
+
+(deftest joined-model-test
+  (is (= (instance/instance ::venues.with-category
+                            {:id              1
+                             :name            "bar"
+                             :category        "bar"
+                             :created-at      (LocalDateTime/parse "2017-01-01T00:00")
+                             :updated-at      (LocalDateTime/parse "2017-01-01T00:00")
+                             :slug            "bar_01"
+                             :parent-category nil})
+         (select/select-one ::venues.with-category
+                            {:left-join [[:category :c] [:= :venues.category :c.name]]
+                             :order-by  [[:id :asc]]}))))

test/toucan2/test.clj

@@ -118,11 +118,12 @@
   (fn [db-type model-or-table-name]
     [(keyword db-type) (keyword model-or-table-name)]))
 
-(m/defmethod create-table-sql-file [:postgres :people] [_db-type _table] "toucan2/test/people.postgres.sql")
-(m/defmethod create-table-sql-file [:h2 :people]       [_db-type _table] "toucan2/test/people.h2.sql")
-(m/defmethod create-table-sql-file [:postgres :venues] [_db-type _table] "toucan2/test/venues.postgres.sql")
-(m/defmethod create-table-sql-file [:h2 :venues]       [_db-type _table] "toucan2/test/venues.h2.sql")
-(m/defmethod create-table-sql-file [:default :birds]   [_db-type _table] "toucan2/test/birds.sql")
+(m/defmethod create-table-sql-file [:postgres :people]    [_db-type _table] "toucan2/test/people.postgres.sql")
+(m/defmethod create-table-sql-file [:h2 :people]          [_db-type _table] "toucan2/test/people.h2.sql")
+(m/defmethod create-table-sql-file [:postgres :venues]    [_db-type _table] "toucan2/test/venues.postgres.sql")
+(m/defmethod create-table-sql-file [:h2 :venues]          [_db-type _table] "toucan2/test/venues.h2.sql")
+(m/defmethod create-table-sql-file [:default :birds]      [_db-type _table] "toucan2/test/birds.sql")
+(m/defmethod create-table-sql-file [:default :categories] [_db-type _table] "toucan2/test/categories.sql")
 
 (derive ::people ::models)
 
@@ -142,6 +143,12 @@
   [_model]
   "birds")
 
+(derive ::categories ::models)
+
+(m/defmethod model/table-name ::categories
+  [_model]
+  "category")
+
 (defn- create-table-statements [db-type table-name]
   (let [filename (create-table-sql-file db-type table-name)
         file     (some-> (io/resource filename) io/file)]
@@ -184,7 +191,8 @@
     (with-open [conn (java.sql.DriverManager/getConnection (test-db-url db-type))]
       (doseq [table-name [:people
                           :venues
-                          :birds]]
+                          :birds
+                          :categories]]
         (create-table! db-type conn table-name)))
     (swap! initialized-test-dbs conj db-type)))
 

test/toucan2/test/categories.sql

@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS category;
+
+CREATE TABLE category (
+  name text PRIMARY KEY NOT NULL,
+  slug text,
+  parent_category text REFERENCES category (name) ON DELETE CASCADE
+);
+
+INSERT INTO category (name, slug, parent_category)
+VALUES
+('bar',      'bar_01',      NULL),
+('store',    'store_02',    NULL),
+('dive-bar', 'dive_bar_03', 'bar');