@@ -56,22 +56,22 @@ describe("SelectQueryBuilder", () => {
5656
5757 const result = builder . where ( where ) . build ( ) ;
5858
59- expect ( result . sql ) . toContain ( " WHERE users. age > $1" ) ;
59+ expect ( result . sql ) . toContain ( ` WHERE " users"." age" > $1` ) ;
6060 expect ( result . values ) . toEqual ( [ 18 ] ) ;
6161 } ) ;
6262
6363 it ( "should build correct SQL for composite AND condition" , ( ) => {
6464 const where : CompositeWhere < User > = {
6565 AND : [
66- { key : "age" , operator : ">" , value : 18 } as SimpleWhere < User > ,
67- { key : "name" , operator : "=" , value : "John" } as SimpleWhere < User > ,
66+ { key : "age" , operator : ">" , value : 18 } ,
67+ { key : "name" , operator : "=" , value : "John" } ,
6868 ] ,
6969 } ;
7070
7171 const result = builder . where ( where ) . build ( ) ;
7272
7373 expect ( result . sql ) . toContain (
74- " WHERE (users. age > $1 AND users. name = $2)"
74+ ` WHERE (" users"." age" > $1 AND " users"." name" = $2)`
7575 ) ;
7676 expect ( result . values ) . toEqual ( [ 18 , "John" ] ) ;
7777 } ) ;
@@ -86,7 +86,7 @@ describe("SelectQueryBuilder", () => {
8686
8787 const result = builder . where ( where ) . build ( ) ;
8888
89- expect ( result . sql ) . toContain ( " WHERE (users. age > $1 OR users. name = $2)" ) ;
89+ expect ( result . sql ) . toContain ( ` WHERE (" users"." age" > $1 OR " users"." name" = $2)` ) ;
9090 expect ( result . values ) . toEqual ( [ 18 , "John" ] ) ;
9191 } ) ;
9292
@@ -100,21 +100,21 @@ describe("SelectQueryBuilder", () => {
100100 key : "name" ,
101101 operator : "=" ,
102102 value : "John" ,
103- } as SimpleWhere < User > ,
103+ } ,
104104 {
105105 key : "name" ,
106106 operator : "=" ,
107107 value : "Jane" ,
108- } as SimpleWhere < User > ,
108+ } ,
109109 ] ,
110- } as CompositeWhere < User > ,
110+ }
111111 ] ,
112112 } ;
113113
114114 const result = builder . where ( where ) . build ( ) ;
115115
116116 expect ( result . sql ) . toContain (
117- " WHERE (users. age > $1 AND (users. name = $2 OR users. name = $3))"
117+ ` WHERE (" users"." age" > $1 AND (" users"." name" = $2 OR " users"." name" = $3))`
118118 ) ;
119119 expect ( result . values ) . toEqual ( [ 18 , "John" , "Jane" ] ) ;
120120 } ) ;
@@ -134,7 +134,7 @@ describe("SelectQueryBuilder", () => {
134134 const result = builder . join ( join ) . build ( ) ;
135135
136136 expect ( result . sql ) . toContain (
137- " INNER JOIN roles ON users.role_id = roles. id"
137+ ` INNER JOIN " roles" AS "roles" ON " roles"." id" = "roleId"`
138138 ) ;
139139 expect ( result . values ) . toEqual ( [ ] ) ;
140140 } ) ;
0 commit comments