Skip to content

feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-sixty merged 7 commits into from
May 23, 2024
Merged

feat: Allow join side to take an ident that resolves to a literal #4499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21722c1
Allow join side: to take an ident that resolves to a literal
kgutwin May 22, 2024
df98d1a
comment and changelog
kgutwin May 22, 2024
c2dfd91
Merge branch 'main' into kg/join-side-literal
kgutwin May 23, 2024
65bbdfd
update comment
kgutwin May 23, 2024
f82db43
report resolved value in err msg
kgutwin May 23, 2024
e89308f
Update CHANGELOG.md
kgutwin May 23, 2024
7623486
pre-commit update
kgutwin May 23, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
generates Markdown documentation from `.prql` files. (@vanillajonathan,
#4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
this is an experimental feature which may change in the future) (@kgutwin,
#4499)

**Fixes**:

Expand Down
38 changes: 30 additions & 8 deletions prqlc/prqlc/src/semantic/resolver/transforms.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

let side = {
let span = side.span;
let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
let ident =
side.clone()
.try_cast(ExprKind::into_ident, Some("side"), "ident")?;

// first try to match the raw ident string as a bare word
match ident.to_string().as_str() {
"inner" => JoinSide::Inner,
"left" => JoinSide::Left,
"right" => JoinSide::Right,
"full" => JoinSide::Full,

found => {
return Err(Error::new(Reason::Expected {
who: Some("`side`".to_string()),
expected: "inner, left, right or full".to_string(),
found: found.to_string(),
})
.with_span(span))
_ => {
// if that fails, fold the ident and try treating the result as a literal
// this allows the join side to be passed as a function parameter
// NOTE: this is temporary, pending discussions and implementation, tracked in #4501
let folded = self.fold_expr(side)?.try_cast(
ExprKind::into_literal,
Some("side"),
"string literal",
)?;

match folded.to_string().as_str() {
"\"inner\"" => JoinSide::Inner,
"\"left\"" => JoinSide::Left,
"\"right\"" => JoinSide::Right,
"\"full\"" => JoinSide::Full,

_ => {
return Err(Error::new(Reason::Expected {
who: Some("`side`".to_string()),
expected: "inner, left, right or full".to_string(),
found: folded.to_string(),
})
.with_span(span))
}
}
}
}
};
Expand Down
74 changes: 74 additions & 0 deletions prqlc/prqlc/tests/integration/sql.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
assert_snapshot!((compile(r###"
let my_side = "right"

from x
join y (==id) side:my_side
"###).unwrap()), @r###"
SELECT
x.*,
y.*
FROM
x
RIGHT JOIN y ON x.id = y.id
"###);
}

#[test]
fn test_join_side_literal_err() {
assert_snapshot!((compile(r###"
let my_side = 42

from x
join y (==id) side:my_side
"###).unwrap_err()), @r###"
Error:
╭─[:5:24]
│
5 │ join y (==id) side:my_side
│ ───┬───
│ ╰───── `side` expected inner, left, right or full, but found 42
───╯
"###);
}

#[test]
fn test_join_side_literal_via_func() {
assert_snapshot!((compile(r###"
let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
join side:_param.s m (c == that.k) tbl
)

from x
my_join default_db.y this.id s:"left"
"###).unwrap()), @r###"
SELECT
x.*,
y.*
FROM
x
LEFT JOIN y ON x.id = y.k
"###);
}

#[test]
fn test_join_side_literal_via_func_err() {
assert_snapshot!((compile(r###"
let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
join side:_param.s m (c == that.k) tbl
)

from x
my_join default_db.y this.id s:"four"
"###).unwrap_err()), @r###"
Error:
╭─[:3:25]
│
3 │ join side:_param.s m (c == that.k) tbl
│ ─┬
│ ╰── `side` expected inner, left, right or full, but found "four"
───╯
"###);
}

#[test]
fn test_from_json() {
// Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: Allow join side to take an ident that resolves to a literal by kgutwin · Pull Request #4499 · PRQL/prql · GitHub
Skip to content
feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-sixty
merged 7 commits into

from

May 23, 2024
 Merged


feat: Allow join side to take an ident that resolves to a literal
#4499
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
21722c1

Allow join side: to take an ident that resolves to a literal


kgutwin May 22, 2024
df98d1a

comment and changelog


kgutwin May 22, 2024
c2dfd91

Merge branch 'main' into kg/join-side-literal


kgutwin May 23, 2024
65bbdfd

update comment


kgutwin May 23, 2024
f82db43

report resolved value in err msg


kgutwin May 23, 2024
e89308f

Update CHANGELOG.md


kgutwin May 23, 2024
7623486

pre-commit update


kgutwin May 23, 2024

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


3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
 generates Markdown documentation from `.prql` files. (@vanillajonathan,
 #4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
 this is an experimental feature which may change in the future) (@kgutwin,
 #4499)

**Fixes**:

Expand Down

38 changes: 30 additions & 8 deletions
prqlc/prqlc/src/semantic/resolver/transforms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

 let side = {
 let span = side.span;
 let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
 let ident =
 side.clone()
 .try_cast(ExprKind::into_ident, Some("side"), "ident")?;

 // first try to match the raw ident string as a bare word
 match ident.to_string().as_str() {
 "inner" => JoinSide::Inner,
 "left" => JoinSide::Left,
 "right" => JoinSide::Right,
 "full" => JoinSide::Full,

 found => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: found.to_string(),
 })
 .with_span(span))
 _ => {
 // if that fails, fold the ident and try treating the result as a literal
 // this allows the join side to be passed as a function parameter
 // NOTE: this is temporary, pending discussions and implementation, tracked in #4501
 let folded = self.fold_expr(side)?.try_cast(
 ExprKind::into_literal,
 Some("side"),
 "string literal",
 )?;

 match folded.to_string().as_str() {
 "\"inner\"" => JoinSide::Inner,
 "\"left\"" => JoinSide::Left,
 "\"right\"" => JoinSide::Right,
 "\"full\"" => JoinSide::Full,

 _ => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: folded.to_string(),
 })
 .with_span(span))
 }
 }
 }
 }
 };
Expand Down

74 changes: 74 additions & 0 deletions
prqlc/prqlc/tests/integration/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
 compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
 assert_snapshot!((compile(r###"
 let my_side = "right"

 from x
 join y (==id) side:my_side
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 RIGHT JOIN y ON x.id = y.id
 "###);
}

#[test]
fn test_join_side_literal_err() {
 assert_snapshot!((compile(r###"
 let my_side = 42

 from x
 join y (==id) side:my_side
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:5:24]
 │
 5 │ join y (==id) side:my_side
 │ ───┬───
 │ ╰───── `side` expected inner, left, right or full, but found 42
 ───╯
 "###);
}

#[test]
fn test_join_side_literal_via_func() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"left"
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 LEFT JOIN y ON x.id = y.k
 "###);
}

#[test]
fn test_join_side_literal_via_func_err() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"four"
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:3:25]
 │
 3 │ join side:_param.s m (c == that.k) tbl
 │ ─┬
 │ ╰── `side` expected inner, left, right or full, but found "four"
 ───╯
 "###);
}

#[test]
fn test_from_json() {
 // Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Allow join side to take an ident that resolves to a literal by kgutwin · Pull Request #4499 · PRQL/prql · GitHub
Skip to content
feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-sixty
merged 7 commits into

from

May 23, 2024
 Merged


feat: Allow join side to take an ident that resolves to a literal
#4499
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
21722c1

Allow join side: to take an ident that resolves to a literal


kgutwin May 22, 2024
df98d1a

comment and changelog


kgutwin May 22, 2024
c2dfd91

Merge branch 'main' into kg/join-side-literal


kgutwin May 23, 2024
65bbdfd

update comment


kgutwin May 23, 2024
f82db43

report resolved value in err msg


kgutwin May 23, 2024
e89308f

Update CHANGELOG.md


kgutwin May 23, 2024
7623486

pre-commit update


kgutwin May 23, 2024

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


3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
 generates Markdown documentation from `.prql` files. (@vanillajonathan,
 #4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
 this is an experimental feature which may change in the future) (@kgutwin,
 #4499)

**Fixes**:

Expand Down

38 changes: 30 additions & 8 deletions
prqlc/prqlc/src/semantic/resolver/transforms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

 let side = {
 let span = side.span;
 let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
 let ident =
 side.clone()
 .try_cast(ExprKind::into_ident, Some("side"), "ident")?;

 // first try to match the raw ident string as a bare word
 match ident.to_string().as_str() {
 "inner" => JoinSide::Inner,
 "left" => JoinSide::Left,
 "right" => JoinSide::Right,
 "full" => JoinSide::Full,

 found => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: found.to_string(),
 })
 .with_span(span))
 _ => {
 // if that fails, fold the ident and try treating the result as a literal
 // this allows the join side to be passed as a function parameter
 // NOTE: this is temporary, pending discussions and implementation, tracked in #4501
 let folded = self.fold_expr(side)?.try_cast(
 ExprKind::into_literal,
 Some("side"),
 "string literal",
 )?;

 match folded.to_string().as_str() {
 "\"inner\"" => JoinSide::Inner,
 "\"left\"" => JoinSide::Left,
 "\"right\"" => JoinSide::Right,
 "\"full\"" => JoinSide::Full,

 _ => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: folded.to_string(),
 })
 .with_span(span))
 }
 }
 }
 }
 };
Expand Down

74 changes: 74 additions & 0 deletions
prqlc/prqlc/tests/integration/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
 compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
 assert_snapshot!((compile(r###"
 let my_side = "right"

 from x
 join y (==id) side:my_side
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 RIGHT JOIN y ON x.id = y.id
 "###);
}

#[test]
fn test_join_side_literal_err() {
 assert_snapshot!((compile(r###"
 let my_side = 42

 from x
 join y (==id) side:my_side
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:5:24]
 │
 5 │ join y (==id) side:my_side
 │ ───┬───
 │ ╰───── `side` expected inner, left, right or full, but found 42
 ───╯
 "###);
}

#[test]
fn test_join_side_literal_via_func() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"left"
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 LEFT JOIN y ON x.id = y.k
 "###);
}

#[test]
fn test_join_side_literal_via_func_err() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"four"
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:3:25]
 │
 3 │ join side:_param.s m (c == that.k) tbl
 │ ─┬
 │ ╰── `side` expected inner, left, right or full, but found "four"
 ───╯
 "###);
}

#[test]
fn test_from_json() {
 // Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Allow join side to take an ident that resolves to a literal by kgutwin · Pull Request #4499 · PRQL/prql · GitHub
Skip to content
feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-sixty
merged 7 commits into

from

May 23, 2024
 Merged


feat: Allow join side to take an ident that resolves to a literal
#4499
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
21722c1

Allow join side: to take an ident that resolves to a literal


kgutwin May 22, 2024
df98d1a

comment and changelog


kgutwin May 22, 2024
c2dfd91

Merge branch 'main' into kg/join-side-literal


kgutwin May 23, 2024
65bbdfd

update comment


kgutwin May 23, 2024
f82db43

report resolved value in err msg


kgutwin May 23, 2024
e89308f

Update CHANGELOG.md


kgutwin May 23, 2024
7623486

pre-commit update


kgutwin May 23, 2024

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


3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
 generates Markdown documentation from `.prql` files. (@vanillajonathan,
 #4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
 this is an experimental feature which may change in the future) (@kgutwin,
 #4499)

**Fixes**:

Expand Down

38 changes: 30 additions & 8 deletions
prqlc/prqlc/src/semantic/resolver/transforms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

 let side = {
 let span = side.span;
 let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
 let ident =
 side.clone()
 .try_cast(ExprKind::into_ident, Some("side"), "ident")?;

 // first try to match the raw ident string as a bare word
 match ident.to_string().as_str() {
 "inner" => JoinSide::Inner,
 "left" => JoinSide::Left,
 "right" => JoinSide::Right,
 "full" => JoinSide::Full,

 found => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: found.to_string(),
 })
 .with_span(span))
 _ => {
 // if that fails, fold the ident and try treating the result as a literal
 // this allows the join side to be passed as a function parameter
 // NOTE: this is temporary, pending discussions and implementation, tracked in #4501
 let folded = self.fold_expr(side)?.try_cast(
 ExprKind::into_literal,
 Some("side"),
 "string literal",
 )?;

 match folded.to_string().as_str() {
 "\"inner\"" => JoinSide::Inner,
 "\"left\"" => JoinSide::Left,
 "\"right\"" => JoinSide::Right,
 "\"full\"" => JoinSide::Full,

 _ => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: folded.to_string(),
 })
 .with_span(span))
 }
 }
 }
 }
 };
Expand Down

74 changes: 74 additions & 0 deletions
prqlc/prqlc/tests/integration/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
 compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
 assert_snapshot!((compile(r###"
 let my_side = "right"

 from x
 join y (==id) side:my_side
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 RIGHT JOIN y ON x.id = y.id
 "###);
}

#[test]
fn test_join_side_literal_err() {
 assert_snapshot!((compile(r###"
 let my_side = 42

 from x
 join y (==id) side:my_side
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:5:24]
 │
 5 │ join y (==id) side:my_side
 │ ───┬───
 │ ╰───── `side` expected inner, left, right or full, but found 42
 ───╯
 "###);
}

#[test]
fn test_join_side_literal_via_func() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"left"
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 LEFT JOIN y ON x.id = y.k
 "###);
}

#[test]
fn test_join_side_literal_via_func_err() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"four"
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:3:25]
 │
 3 │ join side:_param.s m (c == that.k) tbl
 │ ─┬
 │ ╰── `side` expected inner, left, right or full, but found "four"
 ───╯
 "###);
}

#[test]
fn test_from_json() {
 // Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
feat: Allow join side to take an ident that resolves to a literal by kgutwin · Pull Request #4499 · PRQL/prql · GitHub
Skip to content
feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-sixty
merged 7 commits into

from

May 23, 2024
 Merged


feat: Allow join side to take an ident that resolves to a literal
#4499
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
21722c1

Allow join side: to take an ident that resolves to a literal


kgutwin May 22, 2024
df98d1a

comment and changelog


kgutwin May 22, 2024
c2dfd91

Merge branch 'main' into kg/join-side-literal


kgutwin May 23, 2024
65bbdfd

update comment


kgutwin May 23, 2024
f82db43

report resolved value in err msg


kgutwin May 23, 2024
e89308f

Update CHANGELOG.md


kgutwin May 23, 2024
7623486

pre-commit update


kgutwin May 23, 2024

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


3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
 generates Markdown documentation from `.prql` files. (@vanillajonathan,
 #4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
 this is an experimental feature which may change in the future) (@kgutwin,
 #4499)

**Fixes**:

Expand Down

38 changes: 30 additions & 8 deletions
prqlc/prqlc/src/semantic/resolver/transforms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

 let side = {
 let span = side.span;
 let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
 let ident =
 side.clone()
 .try_cast(ExprKind::into_ident, Some("side"), "ident")?;

 // first try to match the raw ident string as a bare word
 match ident.to_string().as_str() {
 "inner" => JoinSide::Inner,
 "left" => JoinSide::Left,
 "right" => JoinSide::Right,
 "full" => JoinSide::Full,

 found => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: found.to_string(),
 })
 .with_span(span))
 _ => {
 // if that fails, fold the ident and try treating the result as a literal
 // this allows the join side to be passed as a function parameter
 // NOTE: this is temporary, pending discussions and implementation, tracked in #4501
 let folded = self.fold_expr(side)?.try_cast(
 ExprKind::into_literal,
 Some("side"),
 "string literal",
 )?;

 match folded.to_string().as_str() {
 "\"inner\"" => JoinSide::Inner,
 "\"left\"" => JoinSide::Left,
 "\"right\"" => JoinSide::Right,
 "\"full\"" => JoinSide::Full,

 _ => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: folded.to_string(),
 })
 .with_span(span))
 }
 }
 }
 }
 };
Expand Down

74 changes: 74 additions & 0 deletions
prqlc/prqlc/tests/integration/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
 compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
 assert_snapshot!((compile(r###"
 let my_side = "right"

 from x
 join y (==id) side:my_side
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 RIGHT JOIN y ON x.id = y.id
 "###);
}

#[test]
fn test_join_side_literal_err() {
 assert_snapshot!((compile(r###"
 let my_side = 42

 from x
 join y (==id) side:my_side
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:5:24]
 │
 5 │ join y (==id) side:my_side
 │ ───┬───
 │ ╰───── `side` expected inner, left, right or full, but found 42
 ───╯
 "###);
}

#[test]
fn test_join_side_literal_via_func() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"left"
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 LEFT JOIN y ON x.id = y.k
 "###);
}

#[test]
fn test_join_side_literal_via_func_err() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"four"
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:3:25]
 │
 3 │ join side:_param.s m (c == that.k) tbl
 │ ─┬
 │ ╰── `side` expected inner, left, right or full, but found "four"
 ───╯
 "###);
}

#[test]
fn test_from_json() {
 // Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Allow join side to take an ident that resolves to a literal by kgutwin · Pull Request #4499 · PRQL/prql · GitHub
Skip to content
feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-sixty
merged 7 commits into

from

May 23, 2024
 Merged


feat: Allow join side to take an ident that resolves to a literal
#4499
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
21722c1

Allow join side: to take an ident that resolves to a literal


kgutwin May 22, 2024
df98d1a

comment and changelog


kgutwin May 22, 2024
c2dfd91

Merge branch 'main' into kg/join-side-literal


kgutwin May 23, 2024
65bbdfd

update comment


kgutwin May 23, 2024
f82db43

report resolved value in err msg


kgutwin May 23, 2024
e89308f

Update CHANGELOG.md


kgutwin May 23, 2024
7623486

pre-commit update


kgutwin May 23, 2024

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


3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
 generates Markdown documentation from `.prql` files. (@vanillajonathan,
 #4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
 this is an experimental feature which may change in the future) (@kgutwin,
 #4499)

**Fixes**:

Expand Down

38 changes: 30 additions & 8 deletions
prqlc/prqlc/src/semantic/resolver/transforms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

 let side = {
 let span = side.span;
 let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
 let ident =
 side.clone()
 .try_cast(ExprKind::into_ident, Some("side"), "ident")?;

 // first try to match the raw ident string as a bare word
 match ident.to_string().as_str() {
 "inner" => JoinSide::Inner,
 "left" => JoinSide::Left,
 "right" => JoinSide::Right,
 "full" => JoinSide::Full,

 found => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: found.to_string(),
 })
 .with_span(span))
 _ => {
 // if that fails, fold the ident and try treating the result as a literal
 // this allows the join side to be passed as a function parameter
 // NOTE: this is temporary, pending discussions and implementation, tracked in #4501
 let folded = self.fold_expr(side)?.try_cast(
 ExprKind::into_literal,
 Some("side"),
 "string literal",
 )?;

 match folded.to_string().as_str() {
 "\"inner\"" => JoinSide::Inner,
 "\"left\"" => JoinSide::Left,
 "\"right\"" => JoinSide::Right,
 "\"full\"" => JoinSide::Full,

 _ => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: folded.to_string(),
 })
 .with_span(span))
 }
 }
 }
 }
 };
Expand Down

74 changes: 74 additions & 0 deletions
prqlc/prqlc/tests/integration/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
 compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
 assert_snapshot!((compile(r###"
 let my_side = "right"

 from x
 join y (==id) side:my_side
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 RIGHT JOIN y ON x.id = y.id
 "###);
}

#[test]
fn test_join_side_literal_err() {
 assert_snapshot!((compile(r###"
 let my_side = 42

 from x
 join y (==id) side:my_side
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:5:24]
 │
 5 │ join y (==id) side:my_side
 │ ───┬───
 │ ╰───── `side` expected inner, left, right or full, but found 42
 ───╯
 "###);
}

#[test]
fn test_join_side_literal_via_func() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"left"
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 LEFT JOIN y ON x.id = y.k
 "###);
}

#[test]
fn test_join_side_literal_via_func_err() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"four"
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:3:25]
 │
 3 │ join side:_param.s m (c == that.k) tbl
 │ ─┬
 │ ╰── `side` expected inner, left, right or full, but found "four"
 ───╯
 "###);
}

#[test]
fn test_from_json() {
 // Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Allow join side to take an ident that resolves to a literal by kgutwin · Pull Request #4499 · PRQL/prql · GitHub
Skip to content
feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-sixty
merged 7 commits into

from

May 23, 2024
 Merged


feat: Allow join side to take an ident that resolves to a literal
#4499
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
21722c1

Allow join side: to take an ident that resolves to a literal


kgutwin May 22, 2024
df98d1a

comment and changelog


kgutwin May 22, 2024
c2dfd91

Merge branch 'main' into kg/join-side-literal


kgutwin May 23, 2024
65bbdfd

update comment


kgutwin May 23, 2024
f82db43

report resolved value in err msg


kgutwin May 23, 2024
e89308f

Update CHANGELOG.md


kgutwin May 23, 2024
7623486

pre-commit update


kgutwin May 23, 2024

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


3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
 generates Markdown documentation from `.prql` files. (@vanillajonathan,
 #4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
 this is an experimental feature which may change in the future) (@kgutwin,
 #4499)

**Fixes**:

Expand Down

38 changes: 30 additions & 8 deletions
prqlc/prqlc/src/semantic/resolver/transforms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

 let side = {
 let span = side.span;
 let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
 let ident =
 side.clone()
 .try_cast(ExprKind::into_ident, Some("side"), "ident")?;

 // first try to match the raw ident string as a bare word
 match ident.to_string().as_str() {
 "inner" => JoinSide::Inner,
 "left" => JoinSide::Left,
 "right" => JoinSide::Right,
 "full" => JoinSide::Full,

 found => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: found.to_string(),
 })
 .with_span(span))
 _ => {
 // if that fails, fold the ident and try treating the result as a literal
 // this allows the join side to be passed as a function parameter
 // NOTE: this is temporary, pending discussions and implementation, tracked in #4501
 let folded = self.fold_expr(side)?.try_cast(
 ExprKind::into_literal,
 Some("side"),
 "string literal",
 )?;

 match folded.to_string().as_str() {
 "\"inner\"" => JoinSide::Inner,
 "\"left\"" => JoinSide::Left,
 "\"right\"" => JoinSide::Right,
 "\"full\"" => JoinSide::Full,

 _ => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: folded.to_string(),
 })
 .with_span(span))
 }
 }
 }
 }
 };
Expand Down

74 changes: 74 additions & 0 deletions
prqlc/prqlc/tests/integration/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
 compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
 assert_snapshot!((compile(r###"
 let my_side = "right"

 from x
 join y (==id) side:my_side
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 RIGHT JOIN y ON x.id = y.id
 "###);
}

#[test]
fn test_join_side_literal_err() {
 assert_snapshot!((compile(r###"
 let my_side = 42

 from x
 join y (==id) side:my_side
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:5:24]
 │
 5 │ join y (==id) side:my_side
 │ ───┬───
 │ ╰───── `side` expected inner, left, right or full, but found 42
 ───╯
 "###);
}

#[test]
fn test_join_side_literal_via_func() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"left"
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 LEFT JOIN y ON x.id = y.k
 "###);
}

#[test]
fn test_join_side_literal_via_func_err() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"four"
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:3:25]
 │
 3 │ join side:_param.s m (c == that.k) tbl
 │ ─┬
 │ ╰── `side` expected inner, left, right or full, but found "four"
 ───╯
 "###);
}

#[test]
fn test_from_json() {
 // Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
feat: Allow join side to take an ident that resolves to a literal by kgutwin · Pull Request #4499 · PRQL/prql · GitHub
Skip to content
feat: Allow join side to take an ident that resolves to a literal#4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-sixty
merged 7 commits into

from

May 23, 2024
 Merged


feat: Allow join side to take an ident that resolves to a literal
#4499
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
21722c1

Allow join side: to take an ident that resolves to a literal


kgutwin May 22, 2024
df98d1a

comment and changelog


kgutwin May 22, 2024
c2dfd91

Merge branch 'main' into kg/join-side-literal


kgutwin May 23, 2024
65bbdfd

update comment


kgutwin May 23, 2024
f82db43

report resolved value in err msg


kgutwin May 23, 2024
e89308f

Update CHANGELOG.md


kgutwin May 23, 2024
7623486

pre-commit update


kgutwin May 23, 2024

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


3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
 generates Markdown documentation from `.prql` files. (@vanillajonathan,
 #4152).
- Add `prqlc lex` command to the CLI (@max-sixty)
- Join `side` parameter can take a reference that resolves to a literal (note:
 this is an experimental feature which may change in the future) (@kgutwin,
 #4499)

**Fixes**:

Expand Down

38 changes: 30 additions & 8 deletions
prqlc/prqlc/src/semantic/resolver/transforms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,20 +101,42 @@ impl Resolver<'_> {

 let side = {
 let span = side.span;
 let ident = side.try_cast(ExprKind::into_ident, Some("side"), "ident")?;
 let ident =
 side.clone()
 .try_cast(ExprKind::into_ident, Some("side"), "ident")?;

 // first try to match the raw ident string as a bare word
 match ident.to_string().as_str() {
 "inner" => JoinSide::Inner,
 "left" => JoinSide::Left,
 "right" => JoinSide::Right,
 "full" => JoinSide::Full,

 found => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: found.to_string(),
 })
 .with_span(span))
 _ => {
 // if that fails, fold the ident and try treating the result as a literal
 // this allows the join side to be passed as a function parameter
 // NOTE: this is temporary, pending discussions and implementation, tracked in #4501
 let folded = self.fold_expr(side)?.try_cast(
 ExprKind::into_literal,
 Some("side"),
 "string literal",
 )?;

 match folded.to_string().as_str() {
 "\"inner\"" => JoinSide::Inner,
 "\"left\"" => JoinSide::Left,
 "\"right\"" => JoinSide::Right,
 "\"full\"" => JoinSide::Full,

 _ => {
 return Err(Error::new(Reason::Expected {
 who: Some("`side`".to_string()),
 expected: "inner, left, right or full".to_string(),
 found: folded.to_string(),
 })
 .with_span(span))
 }
 }
 }
 }
 };
Expand Down

74 changes: 74 additions & 0 deletions
prqlc/prqlc/tests/integration/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,6 +2385,80 @@ fn test_join() {
 compile("from x | join y {==x.id}").unwrap_err();
}

#[test]
fn test_join_side_literal() {
 assert_snapshot!((compile(r###"
 let my_side = "right"

 from x
 join y (==id) side:my_side
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 RIGHT JOIN y ON x.id = y.id
 "###);
}

#[test]
fn test_join_side_literal_err() {
 assert_snapshot!((compile(r###"
 let my_side = 42

 from x
 join y (==id) side:my_side
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:5:24]
 │
 5 │ join y (==id) side:my_side
 │ ───┬───
 │ ╰───── `side` expected inner, left, right or full, but found 42
 ───╯
 "###);
}

#[test]
fn test_join_side_literal_via_func() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"left"
 "###).unwrap()), @r###"
 SELECT
 x.*,
 y.*
 FROM
 x
 LEFT JOIN y ON x.id = y.k
 "###);
}

#[test]
fn test_join_side_literal_via_func_err() {
 assert_snapshot!((compile(r###"
 let my_join = func m <relation> c <scalar> s <text>:"right" tbl <relation> -> (
 join side:_param.s m (c == that.k) tbl
 )

 from x
 my_join default_db.y this.id s:"four"
 "###).unwrap_err()), @r###"
 Error:
 ╭─[:3:25]
 │
 3 │ join side:_param.s m (c == that.k) tbl
 │ ─┬
 │ ╰── `side` expected inner, left, right or full, but found "four"
 ───╯
 "###);
}

#[test]
fn test_from_json() {
 // Test that the SQL generated from the JSON of the PRQL is the same as the raw PRQL
Expand Down