Merge pull request taozhi8833998#2606 from taozhi8833998/fix-order-index-columns

fix: sqlify index_columns multiple order attributes in pg

Author: taozhi8833998

src/column.js

@@ -135,8 +135,8 @@ function columnOption(definition) {
 }
 
 function columnOrderToSQL(columnOrder) {
-  const { column, collate, nulls, opclass, order_by } = columnOrder
-  const columnExpr = typeof column === 'string' ? { type: 'column_ref', table: columnOrder.table, column } : columnOrder
+  const { order_by, column, collate, nulls, opclass } = columnOrder
+  const columnExpr = typeof column === 'string' ? { type: 'column_ref', table: columnOrder.table, column } : ({ ...columnOrder, order_by: null })
   columnExpr.collate = null
   const result = [
     exprToSQL(columnExpr),

src/command.js

@@ -175,8 +175,8 @@ function ifToSQL(stmt) {
   if (elseifExpr) {
     result.push(
       elseifExpr.map(
-        elseif => [toUpper(elseif.type), exprToSQL(elseif.boolean_expr), 'THEN', astToSQL(elseif.then.ast || elseif.then), elseif.semicolon].filter(hasVal).join(' ')
-      ).join(' ')
+        elseif => [toUpper(elseif.type), exprToSQL(elseif.boolean_expr), 'THEN', astToSQL(elseif.then.ast || elseif.then), elseif.semicolon].filter(hasVal).join(' '),
+      ).join(' '),
     )
   }
   if (elseExpr) result.push('ELSE', `${astToSQL(elseExpr.ast || elseExpr)}${semicolons[1]}`)
@@ -207,7 +207,7 @@ function grantAndRevokeToSQL(stmt) {
       case 'priv':
         result.push(
           literalToSQL(on.object_type),
-          on.priv_level.map(privLevel => [identifierToSql(privLevel.prefix), identifierToSql(privLevel.name)].filter(hasVal).join('.')).join(', ')
+          on.priv_level.map(privLevel => [identifierToSql(privLevel.prefix), identifierToSql(privLevel.name)].filter(hasVal).join('.')).join(', '),
         )
         break
       case 'proxy':

src/tables.js

@@ -13,7 +13,7 @@ function unnestToSQL(unnestExpr) {
     commonOptionConnector(
       toUpper(withOffset && withOffset.keyword),
       identifierToSql,
-      withOffset && withOffset.as
+      withOffset && withOffset.as,
     ),
   ]
   return result.filter(hasVal).join(' ')

test/postgres.spec.js

@@ -2360,6 +2360,13 @@ describe('Postgres', () => {
           'CREATE TEMP TABLE "test" (id INT, price MONEY)'
         ]
       },
+      {
+        title: 'create index',
+        sql: [
+          `CREATE INDEX "test" ON "test" USING BTREE ("a" ASC, "b" ASC, "c" DESC);`,
+          'CREATE INDEX "test" ON "test" USING BTREE ("a" ASC, "b" ASC, "c" DESC)'
+        ]
+      }
     ]
     neatlyNestTestedSQL(SQL_LIST)
   })