Merge pull request #101 from benesch/merge-skew

benesch · web-flow · commit 1931c76eb8b3 · 2019-06-03T12:28:49.000-04:00
Fix merge skew by implementing Hash for SQLValues
diff --git a/src/sqlast/query.rs b/src/sqlast/query.rs
@@ -367,7 +367,7 @@ impl ToString for Fetch {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Hash)]
 pub struct SQLValues(pub Vec<Vec<ASTNode>>);
 
 impl ToString for SQLValues {

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ impl ToString for Fetch {`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`
`370`		`-#[derive(Debug, Clone, PartialEq)]`
	`370`	`+#[derive(Debug, Clone, PartialEq, Hash)]`
`371`	`371`	`pub struct SQLValues(pub Vec<Vec<ASTNode>>);`
`372`	`372`
`373`	`373`	`impl ToString for SQLValues {`