fix matcher

Minori Tokuda · Minori Tokuda · commit 71260a8c0a2b · 2021-08-20T09:00:29.000+09:00
diff --git a/main.go b/main.go
@@ -39,16 +39,16 @@ func run() error {
 	return nil
 }
 
-var matcher = regexp.MustCompile(`^(FROM|from) \w+ (AS|as) (\w+)$`)
+var matcher = regexp.MustCompile(`^(FROM|from) ([\w:.-]+) (AS|as) (\w+)$`)
 
 func parse(r io.Reader) ([]string, error) {
 	scanner := bufio.NewScanner(r)
 	var result []string
 	for scanner.Scan() {
 		line := scanner.Bytes()
 		m := matcher.FindAllSubmatch(line, -1)
-		if len(m) > 0 && len(m[0]) > 3 {
-			result = append(result, string(m[0][3]))
+		if len(m) > 0 && len(m[0]) > 4 {
+			result = append(result, string(m[0][4]))
 		}
 	}
 	return result, scanner.Err()

Original file line number	Diff line number	Diff line change
`@@ -39,16 +39,16 @@ func run() error {`
`39`	`39`	`return nil`
`40`	`40`	`}`
`41`	`41`
`42`		-var matcher = regexp.MustCompile(`^(FROM\|from) \w+ (AS\|as) (\w+)$`)
	`42`	+var matcher = regexp.MustCompile(`^(FROM\|from) ([\w:.-]+) (AS\|as) (\w+)$`)
`43`	`43`
`44`	`44`	`func parse(r io.Reader) ([]string, error) {`
`45`	`45`	`scanner := bufio.NewScanner(r)`
`46`	`46`	`var result []string`
`47`	`47`	`for scanner.Scan() {`
`48`	`48`	`line := scanner.Bytes()`
`49`	`49`	`m := matcher.FindAllSubmatch(line, -1)`
`50`		`- if len(m) > 0 && len(m[0]) > 3 {`
`51`		`- result = append(result, string(m[0][3]))`
	`50`	`+ if len(m) > 0 && len(m[0]) > 4 {`
	`51`	`+ result = append(result, string(m[0][4]))`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`return result, scanner.Err()`