Format sql

Former-commit-id: 64ea01b8

fda-ui/components/query/QueryBuilder.vue

@@ -24,7 +24,7 @@
       </v-col>
     </v-row>
     <QBFilter v-if="table" v-model="clauses" :columns="selectItems && selectItems.map(s => s.name)" />
-    <pre v-if="query.sql" v-text="query.sql" />
+    <pre v-if="query.formatted" v-text="query.formatted" />
   </div>
 </template>
 

fda-ui/package.json

@@ -30,6 +30,7 @@
     "node-fetch": "^2.6.1",
     "nuxt": "^2.12.2",
     "nuxt-i18n": "^6.15.4",
+    "sql-formatter": "^4.0.2",
     "vue-toast-notification": "^0.5.4",
     "vuex-persist": "^3.1.3"
   },

fda-ui/server-middleware/query/index.js

+const { format } = require('sql-formatter');
 const knex = require('knex')({ client: 'pg' })
 
 export function buildQuery ({ table, select, clauses }) {
@@ -15,9 +16,10 @@ export function buildQuery ({ table, select, clauses }) {
     }
   }
 
-  let sql
+  let sql, formatted
   try {
     sql = builder.toQuery()
+    formatted = format(sql)
   } catch (e) {
     return {
       error: e.message
@@ -26,6 +28,7 @@ export function buildQuery ({ table, select, clauses }) {
   return {
     table,
     statements: builder._statements,
-    sql
+    sql,
+    formatted
   }
 }

fda-ui/yarn.lock

@@ -2327,6 +2327,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"
@@ -9821,6 +9826,13 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
+sql-formatter@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/sql-formatter/-/sql-formatter-4.0.2.tgz#2b359e5a4c611498d327b9659da7329d71724607"
+  integrity sha512-R6u9GJRiXZLr/lDo8p56L+OyyN2QFJPCDnsyEOsbdIpsnDKL8gubYFo7lNR7Zx7hfdWT80SfkoVS0CMaF/DE2w==
+  dependencies:
+    argparse "^2.0.1"
+
 ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"