Only apply SquishSQLHeredoc when the SQL has no comments

[john-h-k]

Removes all strings and identifiers from the SQL and then checks it for single-comment markers, and does not apply the cop if they are present

[koic]

It could be replaced with a regular expression using gsub as in the comments below.

Suggested change

	SQL_IDENTIFIER_MARKERS = [/".+?"/.freeze, /'.+?'/.freeze, /\[.+?\]/.freeze].freeze
	SQL_IDENTIFIER_MARKERS = /(".+?")|('.+?')|(\[.+?\])/.freeze

[koic]

Suggested change

	def singleline_comments_present?(node)
	text = node.children&.map { |c| c.is_a?(String) ? c : c.value }&.join('\n')
	return false if text.nil?
	SQL_IDENTIFIER_MARKERS.each { |m| text = text.sub(m, '') }
	text.include?('--')
	end
	def singleline_comments_present?(node)
	sql = node.children.map { |c| c.is_a?(String) ? c : c.source }.join('\n')
	sql.gsub(SQL_IDENTIFIER_MARKERS, '').include?('--')
	end

[koic]

I left several comments. Can you update and add a changelog entry?

Added an entry (file) to the changelog folder named {change_type}_{change_description}.md if the new code introduces user-observable changes. See changelog entry format for details.

[john-h-k]

Thank you, have addressed the comments

[koic]

This PR can be merged after CI is passed. Can you fix and squash your commits into one?

[john-h-k]

As in the squash-and-merge option on the PR or as in squashing and repushing?

[koic]

squashing and repushing?

Yeah, please do git rebase -i, squash, and force push to the branch.

[john-h-k]

All squashed. Out of curiosity, is there any advantage to this approach instead of squash-and-merge?

[koic]

All squashed.

It looks like there are commits that haven't been squashed yet :-)

Out of curiosity, is there any advantage to this approach instead of squash-and-merge?

"Squash and merge" changes the commit hash. This will cause broken links, etc. For example, it will take more effort to acquire released tag from PR commits merged into mater. And many more.
#747 (comment)

So, I prefer "Create a merge commit" as a long time maintainer. Of course it depends on maintainers, and I don't want to deny other opinions.

[john-h-k]

It looks like there are commits that haven't been squashed yet :-)

Ugh sorry I committed the suggestion from GitHub and didn't think about squashing that. Done now

"Squash and merge" changes the commit hash. This will cause broken links, etc. For example, it will take more effort to acquire released tag from PR commits merged into mater. And many more.
#747 (comment)

Interesting, thanks!

[koic]

Thank you, too!