       (is (= bv [2]))))
 
   (testing "Select clause with field as condition and alias"
-    (let [q (-> (dsl/select ["foo > 5" "bar"])
+    (let [q (-> (dsl/select '("foo > 5" "bar"))
                 (dsl/from "baz"))]
       (is (= (fmt/get-sql q)
              "select foo > 5 \"bar\" from baz"))))
 
   (testing "Select clause with count(*) expresion"
-    (let [q (-> (dsl/select ["count(*)" "count"])
+    (let [q (-> (dsl/select '("count(*)" "count"))
                 (dsl/from "baz"))]
       (is (= (fmt/get-sql q)
              "select count(*) \"count\" from baz"))))
 
-  (testing "Select with two tables in from clause"
-    (let [q (-> (dsl/select-one)
-                (dsl/from
-                 (dsl/table "table1" {:alias "foo"})
-                 (dsl/table "table2" {:alias "bar"})))]
+  (testing "Select with two tables in from clause 2"
+    (let [q (-> (dsl/select-one)
+                (dsl/from '("table1" "foo")
+                          '("table2" "bar")))]
       (is (= (fmt/get-sql q)
              "select 1 \"one\" from table1 \"foo\", table2 \"bar\""))))
 
-  (testing "Select with two tables in from clause 2"
-    (let [q (-> (dsl/select-one)
-                (dsl/from ["table1" "foo"]
-                          ["table2" "bar"]))]
-      (is (= (fmt/get-sql q)
-             "select 1 \"one\" from table1 \"foo\", table2 \"bar\""))))
-
   (testing "Select clause with join"
     (let [q (-> (dsl/select-one)
-                (dsl/from (dsl/table "book"))
+                (dsl/from "book")
                 (dsl/join "author")
                 (dsl/on "book.authorid = book.id"))]
       (is (= (fmt/get-sql q)

    (let [q (-> (dsl/select)
                (dsl/from (-> (dsl/select :f1)
                              (dsl/from :t1)
                              (dsl/as-table "tt1" "f1"))))]
      (is (= (fmt/get-sql q {:dialect :pgsql})
             "select \"tt1\".\"f1\" from (select f1 from t1) as \"tt1\"(\"f1\")"))))


                 (-> (dsl/values
                      (dsl/row 1 2)
                      (dsl/row 3 4))
                     (dsl/to-table "t1" "f1" "f2"))))]
      (is (= (fmt/get-sql q {:dialect :pgsql})
             "select f1, f2 from (values(?, ?), (?, ?)) as \"t1\"(\"f1\", \"f2\")"))))

