File tree 3 files changed +11
-11
lines changed
operator/src/req_convert/insert
3 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -292,6 +292,7 @@ impl ColumnSchema {
292
292
}
293
293
294
294
/// Creates an impure default value for this column, only if it have a impure default constraint.
295
+ /// Otherwise, returns `Ok(None)`.
295
296
pub fn create_impure_default ( & self ) -> Result < Option < Value > > {
296
297
match & self . default_constraint {
297
298
Some ( c) => c. create_impure_default ( & self . data_type ) ,
Original file line number Diff line number Diff line change @@ -164,10 +164,7 @@ pub fn table_info_value_to_relation_desc(
164
164
. map ( |c| c. default_constraint ( ) . cloned ( ) )
165
165
. collect_vec ( ) ;
166
166
167
- Ok ( TableDesc {
168
- relation_desc,
169
- default_values,
170
- } )
167
+ Ok ( TableDesc :: new ( relation_desc, default_values) )
171
168
}
172
169
173
170
pub fn from_proto_to_data_type (
Original file line number Diff line number Diff line change @@ -53,15 +53,17 @@ impl ImpureDefaultFiller {
53
53
for column in impure_column_list {
54
54
let default_value = column
55
55
. create_impure_default ( )
56
- . context ( ConvertColumnDefaultConstraintSnafu {
56
+ . with_context ( |_| ConvertColumnDefaultConstraintSnafu {
57
57
column_name : column. name . clone ( ) ,
58
58
} ) ?
59
- . expect ( "impure default value" ) ;
60
- let grpc_default_value = api:: helper:: to_proto_value ( default_value. clone ( ) ) ;
61
- let def = column_schemas_to_defs ( vec ! [ column] , & pk_names) ?
62
- . into_iter ( )
63
- . next ( )
64
- . expect ( "column def have one element" ) ;
59
+ . with_context ( || UnexpectedSnafu {
60
+ violated : format ! (
61
+ "Expect default value to be impure, found {:?}" ,
62
+ column. default_constraint( )
63
+ ) ,
64
+ } ) ?;
65
+ let grpc_default_value = api:: helper:: to_proto_value ( default_value) ;
66
+ let def = column_schemas_to_defs ( vec ! [ column] , & pk_names) ?. swap_remove ( 0 ) ;
65
67
let grpc_column_schema = api:: v1:: ColumnSchema {
66
68
column_name : def. name ,
67
69
datatype : def. data_type ,
You can’t perform that action at this time.
0 commit comments