Skip to content

Beautify SQL and update dependencies #25

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
merged 3 commits into from
Feb 18, 2025
Merged

Beautify SQL and update dependencies #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dff1b5
Beautify SQL query
danilo-css Feb 18, 2025
249305e
Update pyodide and new dependency
danilo-css Feb 18, 2025
6ea21ee
Update new dependency
danilo-css Feb 18, 2025
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
315 changes: 161 additions & 154 deletions components/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { Table as Arrow } from "apache-arrow";
import AnalyticsDataLogo from "./AnalyticsDataLogo";
import AnalyticsDataInfo from "./AnalyticsDataInfo";
import { useToast } from "@/hooks/use-toast";
import { format } from "sql-formatter";

export default function Main() {
const { toast } = useToast();
Expand Down Expand Up @@ -88,171 +89,177 @@ export default function Main() {
}, [files.length, aggregation.name, rows.length, columns.length]);

const sqlQuery = (() => {
if (files.length === 0) {
return null;
} else if (
files.length === 1 &&
aggregation.name &&
(rows.length > 0 || columns.length > 0)
) {
const row_list = rows.map((row) => row.name);
const column_list = columns.map((column) => column.name);
const all_fields = [...new Set([...row_list, ...column_list])];
const all_fields_string = all_fields
.map(
(field) =>
`CAST("${field}" AS ${
getTypeForColumn(queryFields, files[0].name, field) === "Utf8"
? "VARCHAR"
: "DOUBLE"
}) AS "${field}"`
)
.join(", ");
const all_fields_string_groupby = all_fields
.map(
(field) =>
`CAST("${field}" AS ${
getTypeForColumn(queryFields, files[0].name, field) === "Utf8"
? "VARCHAR"
: "DOUBLE"
})`
)
.join(", ");

return `
SELECT ${all_fields_string}, ${aggregation.type}(CAST("${
aggregation.name
}" AS ${
getTypeForColumn(queryFields, files[0].name, aggregation.name) ===
"Utf8"
? "VARCHAR"
: "DOUBLE"
})) AS "${aggregation.name}"
FROM '${files[0].name}'
${
filters.length > 0
? `WHERE ${filters
.map(
(filter) =>
`"${filter.field}" IN (${filter.values
.map((value) => `'${value}'`)
.join(", ")})`
)
.join(" AND ")}`
: ""
}
GROUP BY ${all_fields_string_groupby}
`;
} else if (
files.length > 1 &&
aggregation.name &&
(rows.length > 0 || columns.length > 0)
) {
const fields = [...rows, ...columns];

const uniqueFields = [
...new Set(fields.map((field) => JSON.stringify(field))),
].map((str) => JSON.parse(str));

const all_fields_string = uniqueFields.map(
(field) =>
`CAST(TABLE${files.findIndex((file) => file.name === field.table)}."${
field.name
}" AS ${
getTypeForColumn(queryFields, field.table, field.name) === "Utf8"
? "VARCHAR"
: "DOUBLE"
}) AS "${field.name}"`
);

const all_fields_string_groupby = uniqueFields
.map(
const generateQuery = () => {
if (files.length === 0) {
return null;
} else if (
files.length === 1 &&
aggregation.name &&
(rows.length > 0 || columns.length > 0)
) {
const row_list = rows.map((row) => row.name);
const column_list = columns.map((column) => column.name);
const all_fields = [...new Set([...row_list, ...column_list])];
const all_fields_string = all_fields
.map(
(field) =>
`CAST("${field}" AS ${
getTypeForColumn(queryFields, files[0].name, field) === "Utf8"
? "VARCHAR"
: "DOUBLE"
}) AS "${field}"`
)
.join(", ");
const all_fields_string_groupby = all_fields
.map(
(field) =>
`CAST("${field}" AS ${
getTypeForColumn(queryFields, files[0].name, field) === "Utf8"
? "VARCHAR"
: "DOUBLE"
})`
)
.join(", ");

return `
SELECT ${all_fields_string}, ${aggregation.type}(CAST("${
aggregation.name
}" AS ${
getTypeForColumn(queryFields, files[0].name, aggregation.name) ===
"Utf8"
? "VARCHAR"
: "DOUBLE"
})) AS "${aggregation.name}"
FROM '${files[0].name}'
${
filters.length > 0
? `WHERE ${filters
.map(
(filter) =>
`"${filter.field}" IN (${filter.values
.map((value) => `'${value}'`)
.join(", ")})`
)
.join(" AND ")}`
: ""
}
GROUP BY ${all_fields_string_groupby}
`;
} else if (
files.length > 1 &&
aggregation.name &&
(rows.length > 0 || columns.length > 0)
) {
const fields = [...rows, ...columns];

const uniqueFields = [
...new Set(fields.map((field) => JSON.stringify(field))),
].map((str) => JSON.parse(str));

const all_fields_string = uniqueFields.map(
(field) =>
`CAST(TABLE${files.findIndex(
(file) => file.name === field.table
)}."${field.name}" AS ${
getTypeForColumn(queryFields, field.table, field.name) === "Utf8"
? "VARCHAR"
: "DOUBLE"
})`
)
.join(", ");

const relationship_list = relationships.map((relationship) => {
const isPrimaryFloat =
getTypeForColumn(
queryFields,
relationship.primary_table,
}) AS "${field.name}"`
);

const all_fields_string_groupby = uniqueFields
.map(
(field) =>
`CAST(TABLE${files.findIndex(
(file) => file.name === field.table
)}."${field.name}" AS ${
getTypeForColumn(queryFields, field.table, field.name) ===
"Utf8"
? "VARCHAR"
: "DOUBLE"
})`
)
.join(", ");

const relationship_list = relationships.map((relationship) => {
const isPrimaryFloat =
getTypeForColumn(
queryFields,
relationship.primary_table,
relationship.primary_key
) !== "Utf8";
const isForeignFloat =
getTypeForColumn(
queryFields,
relationship.foreign_table,
relationship.foreign_key
) !== "Utf8";
const castType =
isPrimaryFloat || isForeignFloat ? "DOUBLE" : "VARCHAR";

return `CAST(TABLE${files.findIndex(
(file) => file.name === relationship.primary_table
)}."${
relationship.primary_key
) !== "Utf8";
const isForeignFloat =
getTypeForColumn(
queryFields,
relationship.foreign_table,
relationship.foreign_key
) !== "Utf8";
const castType =
isPrimaryFloat || isForeignFloat ? "DOUBLE" : "VARCHAR";

return `CAST(TABLE${files.findIndex(
(file) => file.name === relationship.primary_table
)}."${
relationship.primary_key
}" AS ${castType}) = CAST(TABLE${files.findIndex(
(file) => file.name === relationship.foreign_table
)}."${relationship.foreign_key}" AS ${castType})`;
});
}" AS ${castType}) = CAST(TABLE${files.findIndex(
(file) => file.name === relationship.foreign_table
)}."${relationship.foreign_key}" AS ${castType})`;
});

return `
SELECT ${all_fields_string}, ${aggregation.type}(CAST("${
aggregation.name
}" AS ${
getTypeForColumn(
queryFields,
files[files.findIndex((file) => file.name === aggregation.table)]
.name,
return `
SELECT ${all_fields_string}, ${aggregation.type}(CAST("${
aggregation.name
) === "Utf8"
? "VARCHAR"
: "DOUBLE"
})) AS "${aggregation.name}"
FROM '${files[0].name}' AS TABLE0
JOIN ${files
.slice(1)
.map(
(file) =>
`'${file.name}' AS TABLE${files.findIndex(
(innerFile) => file.name === innerFile.name
)} ON ${relationship_list
.filter((relationship) =>
relationship.includes(
`TABLE${files.findIndex(
(innerFile2) => file.name === innerFile2.name
)}`
}" AS ${
getTypeForColumn(
queryFields,
files[files.findIndex((file) => file.name === aggregation.table)]
.name,
aggregation.name
) === "Utf8"
? "VARCHAR"
: "DOUBLE"
})) AS "${aggregation.name}"
FROM '${files[0].name}' AS TABLE0
JOIN ${files
.slice(1)
.map(
(file) =>
`'${file.name}' AS TABLE${files.findIndex(
(innerFile) => file.name === innerFile.name
)} ON ${relationship_list
.filter((relationship) =>
relationship.includes(
`TABLE${files.findIndex(
(innerFile2) => file.name === innerFile2.name
)}`
)
)
)
.join(" AND ")}`
)
.join(" JOIN ")}
${
filters.length > 0
? `WHERE ${filters
.map(
(filter) =>
`TABLE${files.findIndex(
(file) => file.name === filter.table
)}."${filter.field}" IN (${filter.values
.map((value) => `'${value}'`)
.join(", ")})`
)
.join(" AND ")}`
: ""
}
GROUP BY ${all_fields_string_groupby}
`;
} else {
return `SELECT * FROM '${selectedPreviewFile}' LIMIT ${previewRows}`;
}
.join(" AND ")}`
)
.join(" JOIN ")}
${
filters.length > 0
? `WHERE ${filters
.map(
(filter) =>
`TABLE${files.findIndex(
(file) => file.name === filter.table
)}."${filter.field}" IN (${filter.values
.map((value) => `'${value}'`)
.join(", ")})`
)
.join(" AND ")}`
: ""
}
GROUP BY ${all_fields_string_groupby}
`;
} else {
return `SELECT * FROM '${selectedPreviewFile}' LIMIT ${previewRows}`;
}
};

const rawQuery = generateQuery();
return rawQuery ? format(rawQuery, { language: "sqlite" }) : null;
})();

const handleRunQuery = async () => {
Expand Down
2 changes: 1 addition & 1 deletion lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const PYODIDE_VERSION = "0.27.1";
export const PYODIDE_VERSION = "0.27.2";
Loading