Merge branch 'main' of github.com:HTTPArchive/almanac.httparchive.org into production

Author: tunetheweb

sql/.sqlfluff

@@ -73,6 +73,57 @@ indented_using_on = False
 indented_on_contents = True
 template_blocks_indent = True
 
+# Layout configuration
+# See https://docs.sqlfluff.com/en/stable/layout.html#configuring-layout-and-spacing
+[sqlfluff:layout:type:comma]
+spacing_before = touch
+line_position = trailing
+
+[sqlfluff:layout:type:binary_operator]
+line_position = trailing
+
+[sqlfluff:layout:type:statement_terminator]
+spacing_before = touch
+line_position = trailing
+
+[sqlfluff:layout:type:end_of_file]
+spacing_before = touch
+
+[sqlfluff:layout:type:set_operator]
+line_position = alone:strict
+
+[sqlfluff:layout:type:start_bracket]
+spacing_after = touch
+
+[sqlfluff:layout:type:end_bracket]
+spacing_before = touch
+
+[sqlfluff:layout:type:start_square_bracket]
+spacing_after = touch
+
+[sqlfluff:layout:type:end_square_bracket]
+spacing_before = touch
+
+[sqlfluff:layout:type:casting_operator]
+spacing_before = touch
+spacing_after = touch
+
+[sqlfluff:layout:type:comparison_operator]
+spacing_within = touch
+line_position = leading
+
+[sqlfluff:layout:type:object_reference]
+spacing_within = inline
+
+[sqlfluff:layout:type:comment]
+spacing_before = any
+spacing_after = any
+
+# Template loop tokens shouldn't dictate spacing around them.
+[sqlfluff:layout:type:template_loop]
+spacing_before = any
+spacing_after = any
+
 [sqlfluff:templater]
 unwrap_wrapped_queries = True
 
@@ -84,7 +135,6 @@ apply_dbt_builtins = True
 tab_space_size = 2
 max_line_length = 80
 indent_unit = space
-comma_style = trailing
 allow_scalar = True
 single_table_references = consistent
 unquoted_identifiers_policy = all
@@ -93,6 +143,9 @@ unquoted_identifiers_policy = all
 [sqlfluff:rules:L003]
 hanging_indents = True
 
+# TODO - remove once 1.4.1 fully rolled out as this has been replaced by
+# [sqlfluff:layout:type:binary_operator]
+# line_position = trailing
 [sqlfluff:rules:L007]
 operator_new_lines = before
 

sql/2019/cdn/17_02f.sql

@@ -3,9 +3,9 @@
 
 SELECT
   client,
-  COUNTIF(jscdnHits > 0 ) AS hasJSCDNHits,
+  COUNTIF(jscdnHits > 0) AS hasJSCDNHits,
   COUNT(0) AS hits,
-  ROUND(100 * COUNTIF(jscdnHits > 0 ) / COUNT(0), 2) AS pct
+  ROUND(100 * COUNTIF(jscdnHits > 0) / COUNT(0), 2) AS pct
 FROM
   (
     SELECT

sql/2019/javascript/01_01c.sql

@@ -16,6 +16,6 @@ FROM (
     FROM
       `httparchive.summary_pages.2019_07_01_*`
     GROUP BY
-      bin) )
+      bin))
 ORDER BY
   bin

sql/2019/javascript/01_01d.sql

@@ -19,7 +19,7 @@ FROM (
       `httparchive.summary_pages.2019_07_01_*`
     GROUP BY
       bin,
-      client ) )
+      client))
 ORDER BY
   bin,
   client

sql/2019/media/04_09a.sql

@@ -6,10 +6,10 @@ SELECT client,
   COUNTIF(chHTML AND chHeader) AS chBothCount,
   COUNTIF(chHTML OR chHeader) AS chEitherCount,
   COUNT(0) AS total,
-  ROUND(100 * COUNTIF( chHTML) / COUNT(0), 2) AS chHTMLPct,
-  ROUND(100 * COUNTIF( chHeader) / COUNT(0), 2) AS chHeaderPct,
-  ROUND(100 * COUNTIF( chHTML AND chHeader) / COUNT(0), 2) AS chBothPct,
-  ROUND(100 * COUNTIF( chHTML OR chHeader) / COUNT(0), 2) AS chEitherPct
+  ROUND(100 * COUNTIF(chHTML) / COUNT(0), 2) AS chHTMLPct,
+  ROUND(100 * COUNTIF(chHeader) / COUNT(0), 2) AS chHeaderPct,
+  ROUND(100 * COUNTIF(chHTML AND chHeader) / COUNT(0), 2) AS chBothPct,
+  ROUND(100 * COUNTIF(chHTML OR chHeader) / COUNT(0), 2) AS chEitherPct
 FROM
   (
     SELECT

sql/2019/media/04_09b.sql

@@ -16,8 +16,8 @@ FROM
     WHERE
       date = '2019-07-01' AND
       firstHtml AND
-      ( REGEXP_CONTAINS(body, r'(?is)<meta[^><]*Accept-CH\b') OR
-        REGEXP_CONTAINS(respOtherHeaders, r'(?is)Accept-CH = ') )
+      (REGEXP_CONTAINS(body, r'(?is)<meta[^><]*Accept-CH\b') OR
+        REGEXP_CONTAINS(respOtherHeaders, r'(?is)Accept-CH = '))
   )
 GROUP BY
   client,

sql/2019/media/04_09c.sql

@@ -20,8 +20,8 @@ FROM
         WHERE
           date = '2019-07-01' AND
           firstHtml AND
-          ( REGEXP_CONTAINS(body, r'(?im)<meta[^><]*Accept-CH\b') OR
-            REGEXP_CONTAINS(respOtherHeaders, r'(?im)Accept-CH = ') )
+          (REGEXP_CONTAINS(body, r'(?im)<meta[^><]*Accept-CH\b') OR
+            REGEXP_CONTAINS(respOtherHeaders, r'(?im)Accept-CH = '))
       )
     GROUP BY
       client,

sql/2019/mobile-web/12_17.sql

@@ -16,6 +16,6 @@ FROM (
     FROM
       `httparchive.summary_pages.2019_07_01_mobile`
     GROUP BY
-      bin ) )
+      bin))
 ORDER BY
   bin

sql/2019/security/08_21.sql

@@ -12,7 +12,7 @@ FROM (
     client,
     COUNT(0) AS total,
     COUNTIF(REGEXP_CONTAINS(respOtherHeaders, r'(?i)\Wcontent-security-policy =')) AS csp_count,
-    COUNTIF(REGEXP_CONTAINS(LOWER(REGEXP_EXTRACT(respOtherHeaders, r'(?i)\Wcontent-security-policy =([^,]+)') ), 'upgrade-insecure-requests')) AS csp_upgrade_insecure_requests_count
+    COUNTIF(REGEXP_CONTAINS(LOWER(REGEXP_EXTRACT(respOtherHeaders, r'(?i)\Wcontent-security-policy =([^,]+)')), 'upgrade-insecure-requests')) AS csp_upgrade_insecure_requests_count
   FROM
     `httparchive.almanac.requests`
   WHERE

sql/2019/security/08_35-37.sql

@@ -8,7 +8,7 @@ SELECT
     CASE
       WHEN (STRPOS(LOWER(policy), 'samesite=strict') > 1 OR
           STRPOS(LOWER(policy), 'samesite=lax') > 0 OR
-          STRPOS(LOWER(policy), 'samesite=none') > 1 )
+          STRPOS(LOWER(policy), 'samesite=none') > 1)
         THEN LENGTH(policy)
       WHEN STRPOS(policy, '=') > 1
         THEN STRPOS(LOWER(policy), '=') - 1