Skip to content

[pull] master from supabase:master #230

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 2 commits into from
Sep 3, 2025
Merged

[pull] master from supabase:master #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25af9fa
fix: add apostrophe for sql export (#37920)
Hallidayo Sep 3, 2025
0baa7e5
chore: fix misspelling triggering the misspell checker (#38419)
charislam Sep 3, 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
2 changes: 1 addition & 1 deletion apps/studio/components/interfaces/Storage/__tests__/EmptyBucketModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe(`EmptyBucketModal`, () => {
path: `/platform/storage/:ref/buckets/:id/empty`,
})
// Called by useStorageExplorerStateSnapshot but seems
// to be unnecessary for succesful test?
// to be unnecessary for successful test?
//
// useProjectSettingsV2Query -> ProjectSettings
// GET /platform/projects/:ref/settings
Expand Down
9 changes: 9 additions & 0 deletions apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,21 @@ export const formatTableRowsToSQL = (table: SupaTable, rows: any[]) => {

// We only check for NULL, array and JSON types, everything else we stringify
// given that Postgres can implicitly cast the right type based on the column type
// For string types, we need to deal with escaping single quotes
const stringFormats = ['text', 'varchar']

if (val === null) {
return 'null'
} else if (dataType === 'ARRAY') {
return `'${JSON.stringify(val).replace('[', '{').replace(/.$/, '}')}'`
} else if (format?.includes('json')) {
return `${JSON.stringify(val).replace(/\\"/g, '"').replace(/'/g, "''").replace('"', "'").replace(/.$/, "'")}`
} else if (
typeof format === 'string' &&
typeof val === 'string' &&
stringFormats.includes(format)
) {
return `'${val.replaceAll("'", "''")}'`
} else {
return `'${val}'`
}
Expand Down
10 changes: 6 additions & 4 deletions apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,13 @@ const EntityListItem: ItemRenderer<Entity, EntityListItemProps> = ({
connectionString: project?.connectionString,
table: supaTable,
})

const formattedRows = rows.map((row) => {
const formattedRow = row
Object.keys(row).map((column) => {
if (typeof row[column] === 'object' && row[column] !== null)
formattedRow[column] = JSON.stringify(formattedRow[column])
const formattedRow = { ...row }
Object.keys(row).forEach((column) => {
if (typeof row[column] === 'object' && row[column] !== null) {
formattedRow[column] = JSON.stringify(row[column])
}
})
return formattedRow
})
Expand Down
Loading