Merge pull request #11 from noborus/cellname-y

Also consider cellname as y

Author: noborus

reader.go

@@ -46,6 +46,7 @@ func NewXLSXReader(reader io.Reader, opts *trdsql.ReadOpts) (trdsql.Reader, erro
 		}
 		isFilter = true
 		cellX--
+		cellY--
 	}
 
 	rows, err := f.GetRows(sheet)
@@ -54,10 +55,7 @@ func NewXLSXReader(reader io.Reader, opts *trdsql.ReadOpts) (trdsql.Reader, erro
 	}
 
 	r := XLSXReader{}
-	skip := 0
-	if cellY > 0 {
-		skip = cellY - 1
-	}
+	skip := cellY
 	if opts.InSkip > 0 {
 		skip = opts.InSkip
 	}
@@ -87,15 +85,15 @@ func NewXLSXReader(reader io.Reader, opts *trdsql.ReadOpts) (trdsql.Reader, erro
 		}
 	}
 
-	r.names, r.types = nameType(rows[header], cellX, columnNum, opts.InHeader)
+	r.names, r.types = nameType(rows[header], cellX, cellY, columnNum, opts.InHeader)
 	rowNum := len(rows) - skip
 	body := make([][]any, 0, rowNum)
 	validColumns := make([]bool, columnNum)
 	for i := 0; i < len(r.names); i++ {
 		if r.names[i] != "" {
 			validColumns[i] = true
 		} else {
-			name, err := cellName(cellX + i)
+			name, err := cellName(cellX+i, cellY)
 			if err != nil {
 				return nil, err
 			}
@@ -134,8 +132,8 @@ func NewXLSXReader(reader io.Reader, opts *trdsql.ReadOpts) (trdsql.Reader, erro
 	return r, nil
 }
 
-func cellName(i int) (string, error) {
-	cn, err := excelize.CoordinatesToCellName(i+1, 1)
+func cellName(x int, y int) (string, error) {
+	cn, err := excelize.CoordinatesToCellName(x+1, y+1)
 	if err != nil {
 		return "", err
 	}
@@ -195,15 +193,15 @@ func parseExtend(ext string) (string, string) {
 	}
 }
 
-func nameType(row []string, cellX int, columnNum int, header bool) ([]string, []string) {
+func nameType(row []string, cellX int, cellY int, columnNum int, header bool) ([]string, []string) {
 	nameMap := make(map[string]bool)
 	names := make([]string, columnNum)
 	types := make([]string, columnNum)
 	c := 0
 	for i := cellX; i < cellX+columnNum; i++ {
 		if header && len(row) > i && row[i] != "" {
 			if _, ok := nameMap[row[i]]; ok {
-				name, err := cellName(cellX + i)
+				name, err := cellName(cellX+i, cellY)
 				if err != nil {
 					names[c] = row[i] + "_" + fmt.Sprint(i)
 				} else {