Fixing the review comments

Author: sivaalamp

connection.go

@@ -569,6 +569,8 @@ func (v *connection) defaultMessageHandler(bMsg msgs.BackEndMsg) (bool, error) {
 		connectionLogger.Info("NOTICE: %s", msg.Message)
 	case *msgs.BEParamStatusMsg:
 		connectionLogger.Debug("%v", msg)
+	case *msgs.BEParseCompleteMsg:
+		connectionLogger.Trace("parse complete")
 	default:
 		handled = false
 		err = fmt.Errorf("unhandled message: %v", msg)

go.mod

@@ -2,8 +2,4 @@ module github.com/vertica/vertica-sql-go
 
 go 1.13
 
-require (
-	github.com/elastic/go-sysinfo v1.8.1
-	github.com/pquerna/otp v1.5.0
-	github.com/stretchr/testify v1.3.0
-)
+require github.com/elastic/go-sysinfo v1.8.1

go.sum

@@ -1,5 +1,3 @@
-github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
-github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/elastic/go-sysinfo v1.8.1 h1:4Yhj+HdV6WjbCRgGdZpPJ8lZQlXZLKDAeIkmQ/VRvi4=
@@ -16,8 +14,6 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs=
-github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
 github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0 h1:c8R11WC8m7KNMkTv/0+Be8vvwo4I3/Ut9AC2FW8fX3U=
 github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

parse/statements.go

@@ -5,7 +5,7 @@ import (
 	"unicode"
 )
 
-// Copyright (c) 2020-2024 Open Text.
+// Copyright (c) 2020-2026 Open Text.
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,23 +36,30 @@ func SplitStatements(query string) []string {
 	inLineComment := false
 	inBlockComment := false
 	var dollarTag string
+	statementHasContent := false
 
+	markNonWhitespace := func(b byte) {
+		if !unicode.IsSpace(rune(b)) {
+			statementHasContent = true
+		}
+	}
 	flush := func() {
 		statement := strings.TrimSpace(current.String())
 		current.Reset()
-		if statement != "" {
+		if statement != "" && statementHasContent {
 			statements = append(statements, statement)
 		}
+		statementHasContent = false
 	}
 
 	i := 0
 	for i < len(query) {
 		ch := query[i]
 
 		if inLineComment {
-			// Consume everything until the newline terminator.
-			current.WriteByte(ch)
+			// Swallow comment text but keep the newline terminator so tokens remain separated.
 			if ch == '\n' || ch == '\r' {
+				current.WriteByte(ch)
 				inLineComment = false
 			}
 			i++
@@ -76,9 +83,11 @@ func SplitStatements(query string) []string {
 		if inSingleQuote {
 			// Stay inside the literal, handling doubled single quotes.
 			current.WriteByte(ch)
+			markNonWhitespace(ch)
 			if ch == '\'' {
 				if i+1 < len(query) && query[i+1] == '\'' {
 					current.WriteByte('\'')
+					markNonWhitespace('\'')
 					i += 2
 					continue
 				}
@@ -92,9 +101,11 @@ func SplitStatements(query string) []string {
 			// Identifiers can be quoted with double quotes; treat them like
 			// strings for splitter purposes.
 			current.WriteByte(ch)
+			markNonWhitespace(ch)
 			if ch == '"' {
 				if i+1 < len(query) && query[i+1] == '"' {
 					current.WriteByte('"')
+					markNonWhitespace('"')
 					i += 2
 					continue
 				}
@@ -105,10 +116,12 @@ func SplitStatements(query string) []string {
 		}
 
 		if dollarTag != "" {
+			statementHasContent = true
 			// Inside a dollar-quoted literal; exit only when the exact tag is
 			// observed again.
 			if i+len(dollarTag) <= len(query) && query[i:i+len(dollarTag)] == dollarTag {
 				current.WriteString(dollarTag)
+				markNonWhitespace(dollarTag[0])
 				i += len(dollarTag)
 				dollarTag = ""
 				continue
@@ -121,37 +134,46 @@ func SplitStatements(query string) []string {
 		if ch == '\'' {
 			inSingleQuote = true
 			current.WriteByte(ch)
+			markNonWhitespace(ch)
 			i++
 			continue
 		}
 
 		if ch == '"' {
 			inDoubleQuote = true
 			current.WriteByte(ch)
+			markNonWhitespace(ch)
 			i++
 			continue
 		}
 
 		if ch == '-' && i+1 < len(query) && query[i+1] == '-' {
-			current.WriteByte('-')
-			current.WriteByte('-')
 			i += 2
 			inLineComment = true
 			continue
 		}
 
-		if ch == '/' && i+1 < len(query) && query[i+1] == '*' {
-			current.WriteByte('/')
-			current.WriteByte('*')
-			i += 2
-			inBlockComment = true
-			continue
+		if ch == '/' && i+1 < len(query) {
+			next := query[i+1]
+			if next == '*' {
+				current.WriteByte('/')
+				current.WriteByte('*')
+				i += 2
+				inBlockComment = true
+				continue
+			}
+			if next == '/' {
+				i += 2
+				inLineComment = true
+				continue
+			}
 		}
 
 		if ch == '$' {
 			if tag, length, ok := readDollarTag(query, i); ok {
 				dollarTag = tag
 				current.WriteString(tag)
+				markNonWhitespace(tag[0])
 				i += length
 				continue
 			}
@@ -164,6 +186,7 @@ func SplitStatements(query string) []string {
 		}
 
 		current.WriteByte(ch)
+		markNonWhitespace(ch)
 		i++
 	}
 

parse/statements_test.go

@@ -42,6 +42,16 @@ SELECT 1; /* block;comment */ SELECT 2;`,
 			query:    "  SELECT 1;\n\n ; SELECT 2  ;",
 			expected: []string{"SELECT 1", "SELECT 2"},
 		},
+		{
+			name:     "line comment only",
+			query:    "-- just a comment",
+			expected: nil,
+		},
+		{
+			name:     "double slash line comment",
+			query:    "SELECT 1; // comment about next\nSELECT 2;",
+			expected: []string{"SELECT 1", "SELECT 2"},
+		},
 	}
 
 	for _, tc := range testCases {

rows_multi.go

@@ -1,6 +1,6 @@
 package vertigo
 
-// Copyright (c) 2019-2024 Open Text.
+// Copyright (c) 2019-2026 Open Text.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

stmt.go

@@ -74,7 +74,7 @@ type stmt struct {
 	paramTypes   []common.ParameterType
 	lastRowDesc  *msgs.BERowDescMsg
 	// set if Vertica issues an error of ROLLBACK severity
-	rolledBack bool
+	rolledBack      bool
 	multiStatements bool
 }
 
@@ -87,7 +87,12 @@ func newStmt(connection *connection, command string) (*stmt, error) {
 		parseState:   parseStateUnparsed,
 	}
 
-	s.multiStatements = len(parse.SplitStatements(command)) > 1
+	initialStatements := parse.SplitStatements(command)
+	if len(initialStatements) == 0 {
+		s.command = ""
+		return s, nil
+	}
+	s.multiStatements = len(initialStatements) > 1
 
 	if len(command) == 0 || emailRegexPattern.MatchString(command) {
 		return s, nil
@@ -98,7 +103,13 @@ func newStmt(connection *connection, command string) (*stmt, error) {
 		return "?"
 	}
 	s.command = parse.Lex(command, parse.WithNamedCallback(s.pushNamed), parse.WithPositionalSubstitution(argCounter))
-	s.multiStatements = len(parse.SplitStatements(s.command)) > 1
+	finalStatements := parse.SplitStatements(s.command)
+	if len(finalStatements) == 0 {
+		s.command = ""
+		s.multiStatements = false
+	} else {
+		s.multiStatements = len(finalStatements) > 1
+	}
 	return s, nil
 }
 
@@ -364,7 +375,7 @@ func (s *stmt) runSimpleStatement(ctx context.Context, sql string) (*rows, error
 			result = newRows(ctx, msg, s.conn.serverTZOffset)
 		case *msgs.BECmdDescriptionMsg:
 			continue
-		case *msgs.BECmdCompleteMsg:
+		case *msgs.BECmdCompleteMsg, *msgs.BEParseCompleteMsg:
 			continue
 		case *msgs.BEErrorMsg:
 			return newEmptyRows(), s.evaluateErrorMsg(msg)