HTML not rendering correctly

[Ryan J Ollos]

See report on ​trac-users.

[Jun Omae]

SQLScalar macro always renders a scalar value from the given query as plain text since [14524] because the macro shouldn't render raw html fragment. However, SQLTable macro renders rows from the given query as wiki text, inconsistently.

After the following patch, SQLScalar macro renders a scalar value as wiki text and you can link using such a query SELECT '[https://example.org/ '||COUNT(id)||']' in the macro.

wikitable/scalar.py

@@ -9 +9 @@
 #
 
 from trac.web.chrome import add_stylesheet
-from trac.wiki.formatter import system_message
+from trac.wiki.formatter import format_to_oneliner, system_message
 from trac.wiki.macros import WikiMacroBase
 from trac.util.html import html as tag
-from trac.util.text import exception_to_unicode
+from trac.util.text import exception_to_unicode, to_unicode
 from trac.util.translation import _
 
 
+try:
+    unicode = unicode
+except NameError:
+    unicode = str
+
+
 class SQLScalar(WikiMacroBase):
     """Output a number from a scalar (1x1) SQL query.
 
@@ -36 +42 @@
             rows = self.env.db_query(content)
         except self.env.db_exc.DatabaseError as e:
             return system_message(_("Invalid SQL"), exception_to_unicode(e))
-        else:
-            value = rows[0][0] if len(rows) else "(NULL)"
 
+        def format_(item):
+            if item is None:
+                return tag.em('(NULL)')
+            if item is True:
+                return 'TRUE'
+            if item is False:
+                return 'FALSE'
+            if not isinstance(item, unicode):
+                item = to_unicode(item)
+            return format_to_oneliner(self.env, formatter.context, item)
+
+        value = format_(rows[0][0] if rows else None)
         add_stylesheet(formatter.req, 'wikitable/css/wikitable.css')
         return tag.span(value, class_='wikiscalar')
+
+    def is_inline(self, content):
+        return True