stuff

Author: aacebo

sqlx/as.go

@@ -14,11 +14,11 @@ func As(stmt Sqlizer, alias string) *AsClause {
 }
 
 func (self AsClause) Sql() string {
-	return fmt.Sprintf(`%s as "%s"`, self.stmt.Sql(), self.alias)
+	return fmt.Sprintf(`%s AS "%s"`, self.stmt.Sql(), self.alias)
 }
 
 func (self AsClause) SqlPretty(indent string) string {
-	return fmt.Sprintf(`%s as "%s"`, self.stmt.SqlPretty(indent), self.alias)
+	return fmt.Sprintf(`%s AS "%s"`, self.stmt.SqlPretty(indent), self.alias)
 }
 
 func (self *AsClause) setDepth(depth uint) {

sqlx/select_test.go

@@ -217,6 +217,32 @@ func TestSelect(t *testing.T) {
 		}
 	})
 
+	t.Run("all", func(t *testing.T) {
+		expected, err := os.ReadFile("./testcases/select/all.sql")
+
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		sql := sqlx.Select(
+			"a",
+			"b",
+		).ColumnAs(
+			sqlx.Select("*").From("test").Limit("1"),
+			"tester",
+		).From(
+			"test",
+		).Where(
+			"a = 1",
+		).Or(
+			sqlx.Where("a = 2").And("b = 3"),
+		).GroupBy("a").OrderBy("a", sqlx.Asc).Sql()
+
+		if sql != strings.TrimSuffix(string(expected), "\n") {
+			t.Fatalf(sql)
+		}
+	})
+
 	t.Run("pretty", func(t *testing.T) {
 		t.Run("column", func(t *testing.T) {
 			t.Run("string", func(t *testing.T) {
@@ -425,5 +451,31 @@ func TestSelect(t *testing.T) {
 				t.Fatalf(sql)
 			}
 		})
+
+		t.Run("all", func(t *testing.T) {
+			expected, err := os.ReadFile("./testcases/select/all_pretty.sql")
+
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			sql := sqlx.Select(
+				"a",
+				"b",
+			).ColumnAs(
+				sqlx.Select("*").From("test").Limit("1"),
+				"tester",
+			).From(
+				"test",
+			).Where(
+				"a = 1",
+			).Or(
+				sqlx.Where("a = 2").And("b = 3"),
+			).GroupBy("a").OrderBy("a", sqlx.Asc).SqlPretty("    ")
+
+			if sql != strings.TrimSuffix(string(expected), "\n") {
+				t.Fatalf(sql)
+			}
+		})
 	})
 }

sqlx/testcases/select/all.sql

@@ -0,0 +1 @@
+SELECT a, b, (SELECT * FROM test LIMIT 1) AS "tester" FROM test WHERE a = 1 OR (a = 2 AND b = 3) GROUP BY a ORDER BY a ASC;

sqlx/testcases/select/all_pretty.sql

@@ -0,0 +1,17 @@
+SELECT
+    a,
+    b,
+    (
+        SELECT
+            *
+        FROM test
+        LIMIT 1
+    ) AS "tester"
+FROM test
+WHERE a = 1
+OR (
+    a = 2
+    AND b = 3
+)
+GROUP BY a
+ORDER BY a ASC;

sqlx/testcases/select/column_select.sql

@@ -1 +1 @@
-SELECT (SELECT a, b, c FROM test) as "results";
+SELECT (SELECT a, b, c FROM test) AS "results";

sqlx/testcases/select/column_select_pretty.sql

@@ -5,4 +5,4 @@ SELECT
             b,
             c
         FROM test
-    ) as "results";
+    ) AS "results";

sqlx/testcases/select/column_string_select.sql

@@ -1 +1 @@
-SELECT 1, 2, (SELECT a, b, c FROM test) as "results";
+SELECT 1, 2, (SELECT a, b, c FROM test) AS "results";

sqlx/testcases/select/column_string_select_pretty.sql

@@ -7,4 +7,4 @@ SELECT
             b,
             c
         FROM test
-    ) as "results";
+    ) AS "results";

sqlx/testcases/select/from_select.sql

@@ -1 +1 @@
-SELECT a, b, c FROM (SELECT d, e, f FROM test) as "test";
+SELECT a, b, c FROM (SELECT d, e, f FROM test) AS "test";

sqlx/testcases/select/from_select_pretty.sql

@@ -8,4 +8,4 @@ FROM (
         e,
         f
     FROM test
-) as "test";
+) AS "test";