From 907a601c1dd3dca6f6422263af2ac014877710bc Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Wed, 5 Apr 2017 11:19:22 -0500
Subject: [PATCH] Fix an issue with table creation (named indexes merged)
 (#6366)

---
 validate.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/validate.php b/validate.php
index 6644f28fa1..bff24c956b 100755
--- a/validate.php
+++ b/validate.php
@@ -206,8 +206,9 @@ if (is_file('misc/db_schema.yaml')) {
 
             $columns = array_map('column_schema_to_sql', $data['Columns']);
             $indexes = array_map('index_schema_to_sql', $data['Indexes']);
+            $def = implode(', ', array_merge(array_values($columns), array_values($indexes)));
 
-            $schema_update[] = "CREATE TABLE `$table` (" . implode(', ', array_merge($columns, $indexes)). ');';
+            $schema_update[] = "CREATE TABLE `$table` ($def);";
         } else {
             $previous_column = '';
             foreach ($data['Columns'] as $column => $cdata) {