@@ -2,7 +2,7 @@ use crate::error::Error;
2
2
use crate :: ext:: ustr:: UStr ;
3
3
use crate :: message:: { ParameterDescription , RowDescription } ;
4
4
use crate :: query_as:: query_as;
5
- use crate :: query_scalar:: { query_scalar} ;
5
+ use crate :: query_scalar:: query_scalar;
6
6
use crate :: statement:: PgStatementMetadata ;
7
7
use crate :: type_info:: { PgArrayOf , PgCustomType , PgType , PgTypeKind } ;
8
8
use crate :: types:: Json ;
@@ -11,8 +11,8 @@ use crate::HashMap;
11
11
use crate :: { PgColumn , PgConnection , PgTypeInfo } ;
12
12
use futures_core:: future:: BoxFuture ;
13
13
use smallvec:: SmallVec ;
14
- use std:: sync:: Arc ;
15
14
use sqlx_core:: query_builder:: QueryBuilder ;
15
+ use std:: sync:: Arc ;
16
16
17
17
/// Describes the type of the `pg_type.typtype` column
18
18
///
@@ -426,7 +426,7 @@ WHERE rngtypid = $1
426
426
if meta. columns . len ( ) * 3 > 65535 {
427
427
tracing:: debug!(
428
428
?stmt_id,
429
- num_columns= meta. columns. len( ) ,
429
+ num_columns = meta. columns. len( ) ,
430
430
"number of columns in query is too large to pull nullability for"
431
431
) ;
432
432
}
@@ -436,19 +436,18 @@ WHERE rngtypid = $1
436
436
// This will include columns that don't have a `relation_id` (are not from a table);
437
437
// assuming those are a minority of columns, it's less code to _not_ work around it
438
438
// and just let Postgres return `NULL`.
439
- let mut nullable_query = QueryBuilder :: new (
440
- "SELECT NOT pg_attribute.attnotnull FROM ( "
441
- ) ;
442
-
443
- nullable_query. push_values (
444
- meta. columns . iter ( ) . zip ( 0i32 ..) ,
445
- |mut tuple, ( column, i) | {
446
- // ({i}::int4, {column.relation_id}::int4, {column.relation_attribute_no}::int2)
447
- tuple. push_bind ( i) . push_unseparated ( "::int4" ) ;
448
- tuple. push_bind ( column. relation_id ) . push_unseparated ( "::int4" ) ;
449
- tuple. push_bind ( column. relation_attribute_no ) . push_bind_unseparated ( "::int2" ) ;
450
- } ,
451
- ) ;
439
+ let mut nullable_query = QueryBuilder :: new ( "SELECT NOT pg_attribute.attnotnull FROM ( " ) ;
440
+
441
+ nullable_query. push_values ( meta. columns . iter ( ) . zip ( 0i32 ..) , |mut tuple, ( column, i) | {
442
+ // ({i}::int4, {column.relation_id}::int4, {column.relation_attribute_no}::int2)
443
+ tuple. push_bind ( i) . push_unseparated ( "::int4" ) ;
444
+ tuple
445
+ . push_bind ( column. relation_id )
446
+ . push_unseparated ( "::int4" ) ;
447
+ tuple
448
+ . push_bind ( column. relation_attribute_no )
449
+ . push_bind_unseparated ( "::int2" ) ;
450
+ } ) ;
452
451
453
452
nullable_query. push (
454
453
") as col(idx, table_id, col_idx) \
0 commit comments