Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,6 @@ def process_from_rust(
except Exception as e:
print("Error: ", e)
raise e
if errors != []:
if errors != [] and not config.jinja_ignore_templating:
raise ValueError
return output
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ class FormatterInterface:


class SQLTemplaterError(Exception):
def __init__(self, message):
def __init__(self, message, line_no: Optional[int] = None, line_pos: Optional[int] = None):
self.message = message
self.line_no = line_no
self.line_pos = line_pos


def zero_slice(i: int) -> slice:
Expand Down
21 changes: 17 additions & 4 deletions crates/lib/src/templaters/python_shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub struct PythonFluffConfig {
templater_unwrap_wrapped_queries: bool,

jinja_templater_paths: Vec<String>,
jinja_loader_search_path: Option<String>,
jinja_loader_search_path: Vec<String>,
jinja_apply_dbt_builtins: bool,
jinja_ignore_templating: Option<bool>,
jinja_library_paths: Vec<String>,
Expand Down Expand Up @@ -51,8 +51,18 @@ impl From<&FluffConfig> for PythonFluffConfig {
.unwrap_or_default(),
jinja_loader_search_path: value
.templater_value(TemplaterKind::Jinja, "loader_search_path")
.and_then(|value| value.as_string())
.map(ToString::to_string),
.map(|value| {
if let Some(arr) = value.as_array() {
arr.iter()
.filter_map(|v| v.as_string().map(ToString::to_string))
.collect()
} else if let Some(s) = value.as_string() {
vec![s.to_string()]
} else {
vec![]
}
})
.unwrap_or_default(),
jinja_apply_dbt_builtins: value
.templater_value(TemplaterKind::Jinja, "apply_dbt_builtins")
.and_then(|value| value.as_bool())
Expand Down Expand Up @@ -137,7 +147,10 @@ mod tests {
python_fluff_config.jinja_templater_paths,
Vec::<String>::new()
);
assert_eq!(python_fluff_config.jinja_loader_search_path, None);
assert_eq!(
python_fluff_config.jinja_loader_search_path,
Vec::<String>::new()
);
assert!(python_fluff_config.jinja_apply_dbt_builtins);
assert_eq!(python_fluff_config.jinja_ignore_templating, None);
}
Expand Down
Loading