rebase

Author: levkk

build.rs

@@ -23,6 +23,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let source_paths = vec![
         build_path.join("pg_query").with_extension("h"),
         build_path.join("pg_query_raw.h"),
+        build_path.join("postgres_deparse").with_extension("h"),
         build_path.join("Makefile"),
         build_path.join("src"),
         build_path.join("protobuf"),

src/ast/convert.rs

@@ -977,7 +977,7 @@ impl From<protobuf::GroupingSet> for GroupingSet {
 impl From<protobuf::MergeWhenClause> for MergeWhenClause {
     fn from(pb: protobuf::MergeWhenClause) -> Self {
         MergeWhenClause {
-            matched: pb.matched,
+            match_kind: pb.match_kind.into(),
             command_type: pb.command_type.into(),
             override_: pb.r#override.into(),
             condition: pb.condition.map(|n| n.into()),
@@ -1041,6 +1041,7 @@ impl From<protobuf::Constraint> for Constraint {
             raw_expr: pb.raw_expr.map(|n| n.into()),
             cooked_expr: pb.cooked_expr,
             generated_when: pb.generated_when,
+            inhcount: pb.inhcount,
             nulls_not_distinct: pb.nulls_not_distinct,
             keys: pb.keys.into_iter().map(|n| n.into()).collect(),
             including: pb.including.into_iter().map(|n| n.into()).collect(),
@@ -1634,6 +1635,17 @@ impl From<i32> for CmdType {
     }
 }
 
+impl From<i32> for MergeMatchKind {
+    fn from(v: i32) -> Self {
+        match v {
+            1 => MergeMatchKind::Matched,
+            2 => MergeMatchKind::NotMatchedBySource,
+            3 => MergeMatchKind::NotMatchedByTarget,
+            _ => MergeMatchKind::Undefined,
+        }
+    }
+}
+
 impl From<i32> for TransactionStmtKind {
     fn from(v: i32) -> Self {
         match v {

src/ast/nodes.rs

@@ -814,7 +814,7 @@ pub struct GroupingSet {
 /// MERGE WHEN clause
 #[derive(Debug, Clone, Default)]
 pub struct MergeWhenClause {
-    pub matched: bool,
+    pub match_kind: MergeMatchKind,
     pub command_type: CmdType,
     pub override_: OverridingKind,
     pub condition: Option<Node>,
@@ -875,6 +875,7 @@ pub struct Constraint {
     pub raw_expr: Option<Node>,
     pub cooked_expr: String,
     pub generated_when: String,
+    pub inhcount: i32,
     pub nulls_not_distinct: bool,
     pub keys: Vec<Node>,
     pub including: Vec<Node>,
@@ -1392,6 +1393,16 @@ pub enum CmdType {
     Nothing,
 }
 
+/// MERGE match kind
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum MergeMatchKind {
+    #[default]
+    Undefined,
+    Matched,
+    NotMatchedBySource,
+    NotMatchedByTarget,
+}
+
 /// Transaction statement kind
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum TransactionStmtKind {

src/raw_parse.rs

@@ -849,6 +849,7 @@ unsafe fn convert_constraint(c: &bindings_raw::Constraint) -> protobuf::Constrai
         raw_expr: convert_node_boxed(c.raw_expr),
         cooked_expr: convert_c_string(c.cooked_expr),
         generated_when: if c.generated_when == 0 { String::new() } else { String::from_utf8_lossy(&[c.generated_when as u8]).to_string() },
+        inhcount: c.inhcount,
         nulls_not_distinct: c.nulls_not_distinct,
         keys: convert_list_to_nodes(c.keys),
         including: convert_list_to_nodes(c.including),
@@ -1057,6 +1058,8 @@ unsafe fn convert_execute_stmt(es: &bindings_raw::ExecuteStmt) -> protobuf::Exec
 unsafe fn convert_deallocate_stmt(ds: &bindings_raw::DeallocateStmt) -> protobuf::DeallocateStmt {
     protobuf::DeallocateStmt {
         name: convert_c_string(ds.name),
+        isall: ds.isall,
+        location: ds.location,
     }
 }