Fix rebase conflicts

ankrgyl · ankrgyl · commit f36750841973 · 2022-12-02T07:54:06.000-08:00
diff --git a/src/parser.rs b/src/parser.rs
@@ -4769,15 +4769,15 @@ impl<'a> Parser<'a> {
         let table_name;
         let schema_name;
         if token2 == Token::Period {
-            match token1 {
+            match token1.token {
                 Token::Word(w) => {
                     schema_name = w.value;
                 }
                 _ => {
                     return self.expected("Schema name", token1);
                 }
             }
-            match token3 {
+            match token3.token {
                 Token::Word(w) => {
                     table_name = w.value;
                 }
@@ -4790,7 +4790,7 @@ impl<'a> Parser<'a> {
                 schema_name: Some(schema_name),
             })
         } else {
-            match token1 {
+            match token1.token {
                 Token::Word(w) => {
                     table_name = w.value;
                 }

Original file line number	Diff line number	Diff line change
`@@ -4769,15 +4769,15 @@ impl<'a> Parser<'a> {`
`4769`	`4769`	`let table_name;`
`4770`	`4770`	`let schema_name;`
`4771`	`4771`	`if token2 == Token::Period {`
`4772`		`- match token1 {`
	`4772`	`+ match token1.token {`
`4773`	`4773`	`Token::Word(w) => {`
`4774`	`4774`	`schema_name = w.value;`
`4775`	`4775`	`}`
`4776`	`4776`	`_ => {`
`4777`	`4777`	`return self.expected("Schema name", token1);`
`4778`	`4778`	`}`
`4779`	`4779`	`}`
`4780`		`- match token3 {`
	`4780`	`+ match token3.token {`
`4781`	`4781`	`Token::Word(w) => {`
`4782`	`4782`	`table_name = w.value;`
`4783`	`4783`	`}`
`@@ -4790,7 +4790,7 @@ impl<'a> Parser<'a> {`
`4790`	`4790`	`schema_name: Some(schema_name),`
`4791`	`4791`	`})`
`4792`	`4792`	`} else {`
`4793`		`- match token1 {`
	`4793`	`+ match token1.token {`
`4794`	`4794`	`Token::Word(w) => {`
`4795`	`4795`	`table_name = w.value;`
`4796`	`4796`	`}`