@@ -121,17 +121,20 @@ impl<'until_build> CreateIndex<'until_build> for CreateIndexImpl<'until_build> {
121121 }
122122
123123 Ok ( format ! (
124- "CREATE {} INDEX{} {} ON {} ({}) {};" ,
125- if d. unique { "UNIQUE" } else { "" } ,
124+ "CREATE{} INDEX{} \" {} \" ON \" {} \" ({}){};" ,
125+ if d. unique { " UNIQUE" } else { "" } ,
126126 if d. if_not_exists {
127127 " IF NOT EXISTS"
128128 } else {
129129 ""
130130 } ,
131131 d. name,
132132 d. table_name,
133- d. columns. join( ", " ) ,
134- d. condition. as_ref( ) . map_or( "" , |x| x. as_str( ) ) ,
133+ quote_columns( & d. columns) ,
134+ match d. condition {
135+ None => String :: from( "" ) ,
136+ Some ( cond) => format!( " WHERE {}" , cond. as_str( ) ) ,
137+ }
135138 ) )
136139 }
137140 #[ cfg( feature = "postgres" ) ]
@@ -144,7 +147,7 @@ impl<'until_build> CreateIndex<'until_build> for CreateIndexImpl<'until_build> {
144147 }
145148
146149 Ok ( format ! (
147- "CREATE{} INDEX{} {} ON {} ({}){};" ,
150+ "CREATE{} INDEX{} \" {} \" ON \" {} \" ({}){};" ,
148151 if d. unique { " UNIQUE" } else { "" } ,
149152 if d. if_not_exists {
150153 " IF NOT EXISTS"
@@ -153,7 +156,7 @@ impl<'until_build> CreateIndex<'until_build> for CreateIndexImpl<'until_build> {
153156 } ,
154157 d. name,
155158 d. table_name,
156- d. columns. join ( ", " ) ,
159+ quote_columns ( & d. columns) ,
157160 match d. condition {
158161 None => String :: from( "" ) ,
159162 Some ( cond) => format!( " WHERE {}" , cond. as_str( ) ) ,
@@ -163,3 +166,110 @@ impl<'until_build> CreateIndex<'until_build> for CreateIndexImpl<'until_build> {
163166 }
164167 }
165168}
169+
170+ /// Joins the `columns` into the comma separated list of a CREATE INDEX statement
171+ fn quote_columns ( columns : & [ & str ] ) -> String {
172+ columns
173+ . iter ( )
174+ . map ( |column| format ! ( "\" {column}\" " ) )
175+ . collect :: < Vec < _ > > ( )
176+ . join ( ", " )
177+ }
178+
179+ #[ cfg( test) ]
180+ mod test {
181+ use crate :: create_index:: CreateIndex ;
182+ use crate :: DBImpl ;
183+
184+ #[ cfg( feature = "sqlite" ) ]
185+ #[ test]
186+ fn single_column_sqlite ( ) {
187+ assert_eq ! (
188+ DBImpl :: SQLite
189+ . create_index( "user_login_idx" , "user" )
190+ . add_column( "login" )
191+ . build( )
192+ . unwrap( ) ,
193+ r#"CREATE INDEX "user_login_idx" ON "user" ("login");"#
194+ ) ;
195+ }
196+
197+ #[ cfg( feature = "postgres" ) ]
198+ #[ test]
199+ fn single_column_postgres ( ) {
200+ assert_eq ! (
201+ DBImpl :: Postgres
202+ . create_index( "user_login_idx" , "user" )
203+ . add_column( "login" )
204+ . build( )
205+ . unwrap( ) ,
206+ r#"CREATE INDEX "user_login_idx" ON "user" ("login");"#
207+ ) ;
208+ }
209+
210+ #[ cfg( feature = "sqlite" ) ]
211+ #[ test]
212+ fn multiple_columns_sqlite ( ) {
213+ assert_eq ! (
214+ DBImpl :: SQLite
215+ . create_index( "user_full_name_idx" , "user" )
216+ . add_column( "last_name" )
217+ . add_column( "first_name" )
218+ . build( )
219+ . unwrap( ) ,
220+ r#"CREATE INDEX "user_full_name_idx" ON "user" ("last_name", "first_name");"#
221+ ) ;
222+ }
223+
224+ #[ cfg( feature = "postgres" ) ]
225+ #[ test]
226+ fn multiple_columns_postgres ( ) {
227+ assert_eq ! (
228+ DBImpl :: Postgres
229+ . create_index( "user_full_name_idx" , "user" )
230+ . add_column( "last_name" )
231+ . add_column( "first_name" )
232+ . build( )
233+ . unwrap( ) ,
234+ r#"CREATE INDEX "user_full_name_idx" ON "user" ("last_name", "first_name");"#
235+ ) ;
236+ }
237+
238+ #[ cfg( feature = "sqlite" ) ]
239+ #[ test]
240+ fn unique_and_if_not_exists_sqlite ( ) {
241+ assert_eq ! (
242+ DBImpl :: SQLite
243+ . create_index( "user_login_idx" , "user" )
244+ . add_column( "login" )
245+ . unique( )
246+ . if_not_exists( )
247+ . build( )
248+ . unwrap( ) ,
249+ r#"CREATE UNIQUE INDEX IF NOT EXISTS "user_login_idx" ON "user" ("login");"#
250+ ) ;
251+ }
252+
253+ #[ cfg( feature = "sqlite" ) ]
254+ #[ test]
255+ fn condition_sqlite ( ) {
256+ assert_eq ! (
257+ DBImpl :: SQLite
258+ . create_index( "user_login_idx" , "user" )
259+ . add_column( "login" )
260+ . set_condition( "\" login\" IS NOT NULL" . to_string( ) )
261+ . build( )
262+ . unwrap( ) ,
263+ r#"CREATE INDEX "user_login_idx" ON "user" ("login") WHERE "login" IS NOT NULL;"#
264+ ) ;
265+ }
266+
267+ #[ cfg( feature = "sqlite" ) ]
268+ #[ test]
269+ fn missing_columns_is_an_error ( ) {
270+ assert ! ( DBImpl :: SQLite
271+ . create_index( "user_login_idx" , "user" )
272+ . build( )
273+ . is_err( ) ) ;
274+ }
275+ }
0 commit comments