Merge pull request #468 from dolthub/liuliu/fix-index-type-check

Graphql: fix index type check

Author: liuliu-dev

graphql-server/src/indexes/index.model.ts

@@ -30,7 +30,7 @@ export function fromDoltRowsRes(rows: RawRow[]): Index[] {
     const cols = r.COLUMNS ? r.COLUMNS.split(",") : [];
     return {
       name: r.INDEX_NAME,
-      type: getIndexType(cols, r.NON_UNIQUES === "1"),
+      type: getIndexType(cols, r.NON_UNIQUES === 1),
       comment: r.COMMENTS,
       columns: cols.map(c => {
         return { name: c };

graphql-server/src/queryFactory/dolt/index.ts

@@ -512,7 +512,10 @@ async function getTableInfoWithQR(
     args.tableName,
     `${args.databaseName}/${args.refName}`,
   ]);
-  const idxRows = await query(qh.indexQuery, [args.tableName]);
+  const idxRows = await query(qh.indexQuery, [
+    args.tableName,
+    `${args.databaseName}/${args.refName}`,
+  ]);
   return {
     tableName: args.tableName,
     columns: columns.map(c => column.fromDoltRowRes(c, args.tableName)),

graphql-server/src/queryFactory/dolt/queries.ts

@@ -25,7 +25,7 @@ export const indexQuery = `SELECT
   GROUP_CONCAT(non_unique) AS NON_UNIQUES, 
   GROUP_CONCAT(column_name ORDER BY seq_in_index) AS COLUMNS 
 FROM information_schema.statistics 
-WHERE table_name=? AND index_name!="PRIMARY" 
+WHERE table_name=? AND table_schema=? AND index_name!="PRIMARY" 
 GROUP BY index_name;`;
 
 export const tableColsQuery = `SHOW FULL TABLES WHERE table_type = 'BASE TABLE'`;