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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/sql-editor/SQLEditorLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useExecuteSQL } from '../../hooks/useQuery'
import { useSchemaStoreSync } from '../../hooks/useSchemaStoreSync'
import { schemaStore } from '@/lib/schema-store'
import { queryClient as rpcClient } from '@/lib/connect-client'
import { generateSelect, generateInsert, generateUpdate, generateDelete, generateCreateTable, generateAlterAddColumn } from '@/lib/sql/generate'
import { generateObjectSelect, generateSelect, generateInsert, generateUpdate, generateDelete, generateCreateTable, generateAlterAddColumn } from '@/lib/sql/generate'
import { toastManager } from '../ui/toast'
import type { ObjectType } from './ObjectTree'
import type { SelectedObject } from '@/hooks/useEditorNavigation'
Expand Down Expand Up @@ -177,7 +177,7 @@ export function SQLEditorLayout({
}

// For tables/views, run SELECT query
const query = `SELECT * FROM ${schema}.${objectName} LIMIT 100;`
const query = generateObjectSelect(schema, objectName)

// Check if a tab with the same SQL statement already exists
const existingTab = editorTabs.tabs.find(
Expand Down
3 changes: 2 additions & 1 deletion src/components/sql-editor/schema/TableSchemaContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Button } from '../../ui/button'
import { ScrollArea } from '../../ui/scroll-area'
import { Tabs, TabsList, TabsTab, TabsPanel } from '../../ui/tabs'
import { InfoItem, formatBytes, formatRowCount, getKindLabel, ColumnsTable, IndexesTable, ConstraintsTable, TriggersTable, PoliciesTable, GrantsTable } from './shared'
import { generateObjectSelect } from '@/lib/sql/generate'

interface TableSchemaContentProps {
connectionId: string
Expand Down Expand Up @@ -37,7 +38,7 @@ export function TableSchemaContent({ connectionId, schema, table, onNewQuery }:
const { data: grants, isLoading: grantsLoading } = useGrants(connectionId, schema, table, visitedTabs.has('grants'))

const handleNewQuery = () => {
onNewQuery?.(`SELECT * FROM "${schema}"."${table}" LIMIT 100;`)
onNewQuery?.(generateObjectSelect(schema, table))
}

// Build ER diagram showing table structure and FK relationships
Expand Down
3 changes: 2 additions & 1 deletion src/components/sql-editor/schema/ViewSchemaContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Badge } from '../../ui/badge'
import { Button } from '../../ui/button'
import { ScrollArea } from '../../ui/scroll-area'
import { InfoItem, formatBytes, formatRowCount, getKindLabel, SQLDefinition, ColumnsTable } from './shared'
import { generateObjectSelect } from '@/lib/sql/generate'

interface ViewSchemaContentProps {
connectionId: string
Expand All @@ -17,7 +18,7 @@ export function ViewSchemaContent({ connectionId, schema, view, objectType, onNe
const { data: tableInfo, isLoading: tableInfoLoading } = useTableInfo(connectionId, schema, view)

const handleNewQuery = () => {
onNewQuery?.(`SELECT * FROM "${schema}"."${view}" LIMIT 100;`)
onNewQuery?.(generateObjectSelect(schema, view))
}

const isMaterializedView = objectType === 'materialized_view'
Expand Down
6 changes: 6 additions & 0 deletions src/lib/sql/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ export async function generateSelect(table: string): Promise<string> {
return formatSql(sql)
}

/** Generate a preview query from raw PostgreSQL object names. */
export function generateObjectSelect(schema: string, name: string): string {
const quote = (identifier: string) => `"${identifier.replace(/"/g, '""')}"`
return `SELECT * FROM ${quote(schema)}.${quote(name)} LIMIT 100;`
}

/**
* Generate an INSERT statement with column placeholders.
*/
Expand Down
13 changes: 13 additions & 0 deletions tests/sql-generate.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { describe, it, expect } from 'vitest'
import {
generateObjectSelect,
generateSelect,
generateInsert,
generateUpdate,
Expand All @@ -19,6 +20,18 @@ LIMIT
})
})

describe('generateObjectSelect', () => {
it.each([
['public', 'users', 'SELECT * FROM "public"."users" LIMIT 100;'],
['ExampleSchema', 'ExampleTable_V01', 'SELECT * FROM "ExampleSchema"."ExampleTable_V01" LIMIT 100;'],
['select', 'order', 'SELECT * FROM "select"."order" LIMIT 100;'],
['schema.with.dots', 'table name', 'SELECT * FROM "schema.with.dots"."table name" LIMIT 100;'],
['a"b', 'c"d', 'SELECT * FROM "a""b"."c""d" LIMIT 100;'],
])('quotes schema %s and object %s', (schema, name, expected) => {
expect(generateObjectSelect(schema, name)).toBe(expected)
})
})

describe('generateInsert', () => {
it('generates an INSERT statement with column placeholders', async () => {
const columns = [
Expand Down
Loading