strata-cli 0.1.20 → 0.1.22

data/lib/strata/cli/sub_commands/project.rb

@@ -24,19 +24,15 @@ module Strata
         SAMPLE_REPO = "https://github.com/stratasite/tpc-ds-retail-sample"
         SAMPLE_DIR = "tpc-ds-retail-sample"
         SAMPLE_PROJECT_UID = "tpc-ds-retail-sample"
-        DEFAULT_SERVER = "http://localhost:8080"
 
         desc "sample", "Clone the Strata sample project and set it up interactively"
         option :api_key, aliases: ["a"], type: :string, desc: "Strata API key (optional — skip browser auth)"
         option :server, aliases: ["s"], type: :string, desc: "Strata server URL (optional — prompted if omitted)"
         def sample
-          if options[:api_key] && options[:server]
-            server = options[:server].delete_suffix("/")
-            api_key = options[:api_key]
-          else
-            server = (options[:server] || prompt.ask("Strata server URL:", default: DEFAULT_SERVER) { |q| q.modify :strip }).delete_suffix("/")
-            api_key = fetch_api_key_via_browser(server)
-          end
+          server = Configuration.resolve_server(
+            options[:server] || prompt.ask("Strata server URL:", default: Configuration::DEFAULT_SERVER) { |q| q.modify :strip }
+          )
+          api_key = options[:api_key] || fetch_api_key_via_browser(server)
 
           if File.directory?(SAMPLE_DIR)
             print_info("Directory '#{SAMPLE_DIR}' already exists — re-using it")
@@ -51,9 +47,10 @@ module Strata
             File.write(".gitignore", ".strata\n.strata_cli/\n")
 
             strata_path = ".strata"
-            File.write(strata_path, "api_key: #{api_key}\nserver: #{server}\n")
+            File.write(strata_path, "api_key: #{api_key}\n")
             File.chmod(0o600, strata_path)
 
+            Helpers::ProjectHelper.persist_server_to_project_yml(server)
             Helpers::ProjectHelper.persist_project_id_to_yml(SAMPLE_PROJECT_UID)
 
             system("git add -A", exception: true)

data/lib/strata/cli/utils/archive.rb

@@ -34,7 +34,9 @@ module Strata
         end
 
         private_class_method def collect_yml_files(project_path)
-          Dir.glob(File.join(project_path, "**", "*.yml")).select do |file_path|
+          # The server globs models as {yml,yaml} (deploy_job.rb:121,162), so a
+          # .yaml model has to ship too -- it used to be left out of the archive.
+          Dir.glob(File.join(project_path, "**", "*.{yml,yaml}")).select do |file_path|
             File.file?(file_path)
           end
         end

data/lib/strata/cli/utils/sql_expression_parser.rb

@@ -5,7 +5,19 @@ module Strata
       class ExpressionParser
         attr_reader :expression, :columns, :field_refs, :measure_refs, :dimension_refs, :functions
 
-        def initialize(expression, reserved: DWH.reserved_keywords, aggregates: DWH.aggregate_functions)
+        # The identifier quote for ANSI SQL and any adapter whose quote setting is
+        # bracket-style: [Name] is Strata's field-reference syntax, so an adapter
+        # that quotes with brackets (SQL Server) quotes identifiers with double
+        # quotes in expressions instead.
+        ANSI_QUOTE = '"@exp"'
+
+        # +quote+ is the adapter's identifier quote template from its DWH settings
+        # ("@exp" wrapped in the warehouse's quote characters). Only that quote
+        # marks an identifier: on a backtick warehouse (MySQL, BigQuery, ...) a
+        # double-quoted span is a string literal, not a column.
+        def initialize(expression, reserved: DWH.reserved_keywords, aggregates: DWH.aggregate_functions, quote: ANSI_QUOTE)
+          @open, @close = self.class.quote_pair(quote)
+          @raw = expression
           @expression = expression.downcase
           @reserved = reserved
           @aggregates = aggregates
@@ -46,7 +58,7 @@ module Strata
             stack = [] # one entry per open paren: is it an aggregate call?
             # Bracketed references are consumed atomically FIRST, so a parenthesis inside a
             # reference name ([Month(Date)]) cannot unbalance the stack.
-            remove_string_literals(@expression).scan(/\[([^\]]+)\]@d|\[[^\]]+\](?:@m)?|([a-z_][a-z0-9_]*)?\(|\)/) do
+            scrub(@expression).scan(/\[([^\]]+)\]@d|\[[^\]]+\](?:@m)?|([a-z_][a-z0-9_]*)?\(|\)/) do
               token = Regexp.last_match(0)
               if Regexp.last_match(1)
                 ref = Regexp.last_match(1).strip
@@ -64,6 +76,22 @@ module Strata
         end
 
         class << self
+          # The opening and closing identifier quote characters an adapter's quote
+          # template ("@exp", `@exp`, [@exp]) wraps around a name. Bracket quoting
+          # is Strata's field-reference syntax, so it falls back to ANSI quotes.
+          def quote_pair(template)
+            template = template.to_s
+            template = ANSI_QUOTE if template.strip.empty? || template.start_with?("[")
+            open, close = template.split("@exp", 2)
+            [open, (close.nil? || close.empty?) ? open : close]
+          end
+
+          # String literals: single-quoted always, double-quoted too on a
+          # warehouse whose identifier quote is something else (MySQL, BigQuery).
+          def literal_regex(open)
+            (open == '"') ? /'(?:[^']|'')*'/ : /'(?:[^']|'')*'|"(?:[^"]|"")*"/
+          end
+
           # Can this (resolved) SQL expression legally appear in a GROUP BY? Aggregates and
           # windows evaluate over the grouped rows, so an expression carrying either cannot —
           # the binder rejects it ("GROUP BY clause cannot contain aggregates").
@@ -86,16 +114,19 @@ module Strata
             sql.gsub(/(?<!")\b#{Regexp.quote(col)}\b(?!")/i, qualified)
           end
 
-          def parse(expression, reserved: DWH.reserved_keywords, aggregates: DWH.aggregate_functions)
-            new(expression, reserved: reserved, aggregates: aggregates)
+          def parse(expression, reserved: DWH.reserved_keywords, aggregates: DWH.aggregate_functions, quote: ANSI_QUOTE)
+            new(expression, reserved: reserved, aggregates: aggregates, quote: quote)
           end
         end
 
         private
 
         def parse
-          # Sanitize the expression first
-          sanitized = remove_string_literals(@expression)
+          # Quoted identifiers are collected from the original text -- their case
+          # is part of the name -- and scrubbed out of the working copy along with
+          # string literals, so nothing inside them reads as a function or column.
+          @quoted_identifiers = []
+          sanitized = scrub(@raw) { |ident| @quoted_identifiers << ident unless @quoted_identifiers.include?(ident) }.downcase
 
           matched_refs = []
           # Extract field references in bracketed notation — BEFORE scanning functions, so a
@@ -123,10 +154,7 @@ module Strata
           # grouping — which is what has_window_functions? reports.
           @windowed = sanitized.match?(/\bover\s*\(/)
 
-          # Extract quoted columns
-          @expression.scan(/"([^"]+)"/).flatten.each do |col|
-            @columns << col
-          end
+          @columns.concat(@quoted_identifiers)
 
           # Extract column references (alphanumeric with optional underscores)
           sanitized.scan(/\b([a-zA-Z_][a-zA-Z0-9_]*)\b/).flatten.each do |col|
@@ -136,8 +164,21 @@ module Strata
           @wild = true if sanitized.match?(/\w+\(\s?\*\s?\)/)
         end
 
-        def remove_string_literals(expr)
-          expr.gsub(/'[^']*'/, "'__str__'")
+        # Replaces string literals with a placeholder literal and quoted
+        # identifiers with a numeric placeholder (yielding each identifier's
+        # name), leaving an expression whose remaining words are all bare
+        # references, keywords, or functions. Inside a quoted identifier a
+        # doubled quote character is an escaped quote.
+        def scrub(expr)
+          o, c = Regexp.quote(@open), Regexp.quote(@close)
+          expr.gsub(/#{self.class.literal_regex(@open)}|#{o}((?:[^#{c}]|#{c}#{c})+)#{c}/) do
+            if Regexp.last_match(1)
+              yield Regexp.last_match(1) if block_given?
+              "0"
+            else
+              "'__str__'"
+            end
+          end
         end
 
         def remove_matched_refs(sanitized, matched_refs)

data/lib/strata/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Strata
   module CLI
-    VERSION = "0.1.20"
+    VERSION = "0.1.22"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strata-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.22
 platform: ruby
 authors:
 - Ajo Abraham
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Command-line interface for the Strata Semantic Analytics System
 test_files: []