@@ -817,41 +817,38 @@ impl Statement {
817817
818818 #[ napi]
819819 pub fn columns ( & self , env : Env ) -> Result < Array > {
820- let rt = runtime ( ) ?;
821- rt. block_on ( async move {
822- let columns = self . stmt . columns ( ) ;
823- let mut js_array = env. create_array ( columns. len ( ) as u32 ) ?;
824- for ( i, col) in columns. iter ( ) . enumerate ( ) {
825- let mut js_obj = env. create_object ( ) ?;
826- js_obj. set_named_property ( "name" , env. create_string ( col. name ( ) ) ?) ?;
827- // origin_name -> column
828- if let Some ( origin_name) = col. origin_name ( ) {
829- js_obj. set_named_property ( "column" , env. create_string ( origin_name) ?) ?;
830- } else {
831- js_obj. set_named_property ( "column" , env. get_null ( ) ?) ?;
832- }
833- // table_name -> table
834- if let Some ( table_name) = col. table_name ( ) {
835- js_obj. set_named_property ( "table" , env. create_string ( table_name) ?) ?;
836- } else {
837- js_obj. set_named_property ( "table" , env. get_null ( ) ?) ?;
838- }
839- // database_name -> database
840- if let Some ( database_name) = col. database_name ( ) {
841- js_obj. set_named_property ( "database" , env. create_string ( database_name) ?) ?;
842- } else {
843- js_obj. set_named_property ( "database" , env. get_null ( ) ?) ?;
844- }
845- // decl_type -> type
846- if let Some ( decl_type) = col. decl_type ( ) {
847- js_obj. set_named_property ( "type" , env. create_string ( decl_type) ?) ?;
848- } else {
849- js_obj. set_named_property ( "type" , env. get_null ( ) ?) ?;
850- }
851- js_array. set ( i as u32 , js_obj) ?;
820+ let columns = self . stmt . columns ( ) ;
821+ let mut js_array = env. create_array ( columns. len ( ) as u32 ) ?;
822+ for ( i, col) in columns. iter ( ) . enumerate ( ) {
823+ let mut js_obj = env. create_object ( ) ?;
824+ js_obj. set_named_property ( "name" , env. create_string ( col. name ( ) ) ?) ?;
825+ // origin_name -> column
826+ if let Some ( origin_name) = col. origin_name ( ) {
827+ js_obj. set_named_property ( "column" , env. create_string ( origin_name) ?) ?;
828+ } else {
829+ js_obj. set_named_property ( "column" , env. get_null ( ) ?) ?;
852830 }
853- Ok ( js_array)
854- } )
831+ // table_name -> table
832+ if let Some ( table_name) = col. table_name ( ) {
833+ js_obj. set_named_property ( "table" , env. create_string ( table_name) ?) ?;
834+ } else {
835+ js_obj. set_named_property ( "table" , env. get_null ( ) ?) ?;
836+ }
837+ // database_name -> database
838+ if let Some ( database_name) = col. database_name ( ) {
839+ js_obj. set_named_property ( "database" , env. create_string ( database_name) ?) ?;
840+ } else {
841+ js_obj. set_named_property ( "database" , env. get_null ( ) ?) ?;
842+ }
843+ // decl_type -> type
844+ if let Some ( decl_type) = col. decl_type ( ) {
845+ js_obj. set_named_property ( "type" , env. create_string ( decl_type) ?) ?;
846+ } else {
847+ js_obj. set_named_property ( "type" , env. get_null ( ) ?) ?;
848+ }
849+ js_array. set ( i as u32 , js_obj) ?;
850+ }
851+ Ok ( js_array)
855852 }
856853
857854 #[ napi]
0 commit comments