stuff

thegogod · Nov 21, 2024 · 21df9e1 · 21df9e1
1 parent 47b2930
commit 21df9e1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/sqlx/select.go b/sqlx/select.go
@@ -32,14 +32,17 @@ func (self *SelectStatement) Column(column string) *SelectStatement {
 	return self
 }
 
-func (self *SelectStatement) ColumnAs(column string, alias string) *SelectStatement {
-	self.columns = append(self.columns, As(Raw(column), alias))
-	return self
-}
+func (self *SelectStatement) ColumnAs(column any, alias string) *SelectStatement {
+	switch v := column.(type) {
+	case string:
+		self.columns = append(self.columns, As(Sql{v}, alias))
+		break
+	case *SelectStatement:
+		v.depth = self.depth + 1
+		self.columns = append(self.columns, As(Sql{v}, alias))
+		break
+	}
 
-func (self *SelectStatement) ColumnSelect(stmt *SelectStatement, alias string) *SelectStatement {
-	stmt.depth = self.depth + 1
-	self.columns = append(self.columns, As(stmt, alias))
 	return self
 }
 

diff --git a/sqlx/select_test.go b/sqlx/select_test.go
@@ -31,7 +31,7 @@ func TestSelect(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			sql := sqlx.Select().ColumnSelect(
+			sql := sqlx.Select().ColumnAs(
 				sqlx.Select("a", "b", "c").From("test"),
 				"results",
 			).Sql()
@@ -48,7 +48,7 @@ func TestSelect(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			sql := sqlx.Select("1", "2").ColumnSelect(
+			sql := sqlx.Select("1", "2").ColumnAs(
 				sqlx.Select("a", "b", "c").From("test"),
 				"results",
 			).Sql()
@@ -179,7 +179,7 @@ func TestSelect(t *testing.T) {
 					t.Fatal(err)
 				}
 
-				sql := sqlx.Select().ColumnSelect(
+				sql := sqlx.Select().ColumnAs(
 					sqlx.Select("a", "b", "c").From("test"),
 					"results",
 				).SqlPretty("    ")
@@ -196,7 +196,7 @@ func TestSelect(t *testing.T) {
 					t.Fatal(err)
 				}
 
-				sql := sqlx.Select("1", "2").ColumnSelect(
+				sql := sqlx.Select("1", "2").ColumnAs(
 					sqlx.Select("a", "b", "c").From("test"),
 					"results",
 				).SqlPretty("    ")