Merge branch 'feat/copy-table-queryAndSchema' of https://github.com/wannabespace/conar into feat/copy-table-queryAndSchema

Author: letstri

apps/desktop/src/entities/connection/components/table/utils.ts

@@ -11,6 +11,7 @@ export interface Column {
   scale?: number | null
   unique?: string
   primaryKey?: string
+  defaultValue?: string | null
   foreign?: {
     name: string
     schema: string

apps/desktop/src/entities/connection/generators/formats/sql.ts

@@ -115,14 +115,11 @@ function buildColumnParts(
   typeDef: string,
   dialect: ConnectionType,
   pkColumns: string[],
+  defaultValue?: string | null,
 ): { parts: string[], foreignKey: string | null } {
   const quoted = quoteIdentifier(c.id, dialect)
   const parts = [quoted, typeDef]
 
-  if (!c.isNullable) {
-    parts.push('NOT NULL')
-  }
-
   if (c.primaryKey) {
     pkColumns.push(quoted)
     if (dialect === ConnectionType.MySQL && /int|serial/i.test(c.type ?? '')) {
@@ -133,6 +130,14 @@ function buildColumnParts(
     }
   }
 
+  if (defaultValue !== undefined && defaultValue !== null) {
+    parts.push(`DEFAULT ${defaultValue}`)
+  }
+
+  if (!c.isNullable) {
+    parts.push('NOT NULL')
+  }
+
   if (c.primaryKey && dialect !== ConnectionType.ClickHouse) {
     parts.push('PRIMARY KEY')
   }
@@ -212,8 +217,21 @@ export function generateSchemaSQL({
   const columnLines: string[] = []
 
   for (const c of columns) {
-    const typeDef = getTypeDef(c, table, enums, dialect, usedEnums)
-    const { parts, foreignKey } = buildColumnParts(c, typeDef, dialect, pkColumns)
+    let typeDef = getTypeDef(c, table, enums, dialect, usedEnums)
+    let defaultValue = c.defaultValue
+
+    if (dialect === ConnectionType.Postgres && defaultValue?.toLowerCase().startsWith('nextval')) {
+      if (typeDef === 'INTEGER') {
+        typeDef = 'SERIAL'
+        defaultValue = null
+      }
+      else if (typeDef === 'BIGINT') {
+        typeDef = 'BIGSERIAL'
+        defaultValue = null
+      }
+    }
+
+    const { parts, foreignKey } = buildColumnParts(c, typeDef, dialect, pkColumns, defaultValue)
     columnLines.push(`  ${parts.join(' ')}`)
     if (foreignKey)
       foreignKeys.push(`  ${foreignKey}`)

apps/desktop/src/routes/_protected/database/$id/table/-queries/use-columns-query.ts

@@ -21,6 +21,7 @@ export function useTableColumns({ connection, table, schema }: { connection: typ
       return {
         ...column,
         primaryKey: primaryConstraint?.name,
+        defaultValue: column.default,
         unique: uniqueConstraint?.name,
         foreign: foreignConstraint && foreignConstraint.foreignSchema && foreignConstraint.foreignTable && foreignConstraint.foreignColumn
           ? {