shortened some code.

Author: kaibyao

postgres-rest/src/queries/insert_into_table.rs

@@ -217,11 +217,9 @@ fn execute_insert<'a>(
     insert_statement_tokens.push(&values_params_str);
 
     // generate the ON CONFLICT string
-    let conflict_clause = match generate_conflict_str(&params, &columns) {
-        Some(conflict_str) => conflict_str,
-        None => "".to_string(),
-    };
-    if conflict_clause != "" {
+    let conflict_clause;
+    if let Some(conflict_str) = generate_conflict_str(&params, &columns) {
+        conflict_clause = conflict_str;
         insert_statement_tokens.push(&conflict_clause);
     }
 

postgres-rest/src/queries/update_table_rows.rs

@@ -239,16 +239,14 @@ fn build_update_statement(
     }
 
     // FROM string
-    let from_tables_str = if !fks.is_empty() {
-        ForeignKeyReference::join_foreign_key_references(
+    let from_tables_str;
+    if !fks.is_empty() {
+        from_tables_str = ForeignKeyReference::join_foreign_key_references(
             &fks,
             |(_, _, referred_table, _)| referred_table.to_string(),
             ", ",
-        )
-    } else {
-        "".to_string()
-    };
-    if &from_tables_str != "" {
+        );
+
         query_str_arr.push(" FROM ");
         query_str_arr.push(&from_tables_str);
     }