use block-style comments per PR feedback

Fix the tests

core/dbt/adapters/base/query_headers.py

@@ -47,13 +47,7 @@ def __init__(self, initial):
  self.query_comment: str = initial
 
  def add(self, sql: str) -> str:
- # Make sure there are no trailing newlines.
- # For every newline, add a comment after it in case query_comment
- # is multiple lines.
- # Then add a comment to the first line of the query comment, and
- # put the sql on a fresh line.
- comment_split = self.query_comment.strip().replace('\n', '\n-- ')
- return '-- {}\n{}'.format(comment_split, sql)
+ return '/* {} */\n{}'.format(self.query_comment.strip(), sql)
 
  def set(self, comment: str):
  self.query_comment = comment

test/integration/051_query_comments_test/test_query_comments.py

@@ -79,7 +79,7 @@ def project_config(self):
 
  def matches_comment(self, msg) -> bool:
  self.assertTrue(
- msg.startswith('-- dbt\n-- rules!\n'),
+ msg.startswith('/* dbt\nrules! */\n'),
  f'{msg} did not start with query comment'
  )
 
@@ -102,10 +102,10 @@ def test_bigquery_comments(self):
 
 class TestDefaultQueryComments(QueryComments):
  def matches_comment(self, msg):
- if not msg.startswith('-- '):
+ if not msg.startswith('/* '):
  return False
- # our blob is the first line of the query comments, minus the '-- '
- json_str = msg.split('\n')[0][3:]
+ # our blob is the first line of the query comments, minus the comment
+ json_str = msg.split('\n')[0][3:-3]
  data = json.loads(json_str)
  self.assertEqual(data['app'], 'dbt')
  self.assertEqual(data['dbt_version'], dbt_version)

test/integration/base.py

@@ -324,12 +324,9 @@ def setUp(self):
  os.chdir(self.initial_dir)
  # before we go anywhere, collect the initial path info
  self._logs_dir = os.path.join(self.initial_dir, 'logs', self.prefix)
- print('initial_dir={}'.format(self.initial_dir))
  _really_makedirs(self._logs_dir)
  self.test_original_source_path = _pytest_get_test_root()
- print('test_original_source_path={}'.format(self.test_original_source_path))
  self.test_root_dir = normalize(tempfile.mkdtemp(prefix='dbt-int-test-'))
- print('test_root_dir={}'.format(self.test_root_dir))
  os.chdir(self.test_root_dir)
  try:
  self._symlink_test_folders()
@@ -397,9 +394,6 @@ def set_packages(self):
  with open('packages.yml', 'w') as f:
  yaml.safe_dump(self.packages_config, f, default_flow_style=True)
 
- def test_only_config(self):
- return None
-
  def load_config(self):
  # we've written our profile and project. Now we want to instantiate a
  # fresh adapter for the tests.