test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Jelenkee@max-sixty@eitsupi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Jelenkee@max-sixty@eitsupi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Jelenkee@max-sixty@eitsupi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Jelenkee@max-sixty@eitsupi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Jelenkee@max-sixty@eitsupi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

test: Refactor integration tests - #2362

Merged
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests
Apr 3, 2023
Merged

test: Refactor integration tests#2362
max-sixty merged 15 commits into
PRQL:mainfrom
Jelenkee:refactor-integration-tests

Conversation

@Jelenkee

Copy link
Copy Markdown
Contributor

Comment threadprql-compiler/tests/integration/docker-compose.yml Outdated
@Jelenkee
Jelenkee marked this pull request as draft April 1, 2023 17:15

@max-sixtymax-sixty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks a lot @Jelenkee — this is shaping up to be really excellent code. I left a few comments. Happy to merge now and do those changes in another PR — as you wish.

Comment threadprql-compiler/tests/integration/README.md Outdated
Comment threadprql-compiler/Cargo.toml
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment threadprql-compiler/tests/integration/main.rs Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
Comment thread.github/workflows/test-rust.yaml Outdated
first_result.0,
k
);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your implementation is probably better at debugging, so feel completely free to keep it.

That said, I think it's possible to simplify it a bit — here's one approach. The result is basically the same (the only difference is that the snapshot file contains the input prql as the expression, because of the third item passed to assert_snapshot!)

#[test]fntest_rdbms(){let runtime = Runtime::new().unwrap();letmut connections = get_connections(&runtime);for con in&mut connections {setup_connection(con.as_mut(),&runtime);}// for each of the queriesglob!("queries/**/*.prql", |path| {// readlet prql = fs::read_to_string(path).unwrap();if prql.contains("skip_test"){return;}for con in &mut connections {let vendor = con.get_dialect().to_string().to_lowercase();if prql.contains(format!("skip_{}", vendor).as_str()){continue;}let result = run_query(con.as_mut(), prql.as_str(),&runtime);let result_string = result.iter().map(|row| row.join(",")).join("\n");
assert_snapshot!("rdbms".to_string(),&result_string,&prql);}});}

(hopefully this is helpful feedback, rather than dispiriting that someone is "rewriting your code", let me know either way)

Comment threadprql-compiler/tests/integration/main.rs Outdated
expression: result_string
input_file: prql-compiler/tests/integration/queries/invoice_totals.prql
---
2009-01,2009-01-01,1,2,1.98,2,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not on you at all, and def not necessary in this PR, but one thing we could do is adjust the queries so they produce more aggregated results — we probably get the same test coverage with more legible outputs...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
And we have to remove the skips for certain dbs. Especially MsSQL is hardly tested.

Jelenkeeand others added 2 commits April 2, 2023 21:38
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Looking great! We can merge whenever you're ready!

max-sixty added a commit to max-sixty/prql that referenced this pull request Apr 2, 2023
Taking my own advice from PRQL#2362 — using the tertiary syntax can reduce the number of steps
Merge after PRQL#2362, as it'll have some conflicts.
@Jelenkee

Copy link
Copy Markdown
ContributorAuthor

@max-sixty Docs have been added. You may have a look at it. If everything is fine, you can merge

Comment threadprql-compiler/tests/integration/README.md Outdated
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
@max-sixty

Copy link
Copy Markdown
Member

Great — am promoting it from Draft and will merge!

@max-sixty
max-sixty marked this pull request as ready for review April 3, 2023 17:01
@max-sixty
max-sixty enabled auto-merge (squash) April 3, 2023 17:02
@max-sixty
max-sixty merged commit f4eb8c7 into PRQL:mainApr 3, 2023
max-sixty added a commit that referenced this pull request Apr 3, 2023
Taking my own advice from #2362 — using the tertiary syntax can reduce
the number of steps
Merge after #2362, as it'll have some conflicts.
@max-sixty

Copy link
Copy Markdown
Member

Thanks @Jelenkee !

Is there anything else remaining on the infra? I think it's in a very good state.

If you thought #2362 (comment) was valid, fine to make that change.

We could also start thinking about the current exclusions — was there anything you saw that's a PRQL bug (more than just the DB doesn't support it — in which case maybe we could improve the error messages but can't make it work...)?

@Jelenkee
Jelenkee deleted the refactor-integration-tests branch April 13, 2023 18:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Jelenkee@max-sixty@eitsupi