From 640f4c29155c10b59eb97b76cd7a0021e2c9500f Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 31 Jul 2014 12:52:57 +0000 Subject: [PATCH] Fixing pg build. refs #2499 - Properly reference pg client - Fix broken sql queries --- core/server/data/utils/clients/index.js | 6 +++--- core/server/data/utils/clients/{pgsql.js => pg.js} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename core/server/data/utils/clients/{pgsql.js => pg.js} (90%) diff --git a/core/server/data/utils/clients/index.js b/core/server/data/utils/clients/index.js index 85ea9bcd73..ce187fc81f 100644 --- a/core/server/data/utils/clients/index.js +++ b/core/server/data/utils/clients/index.js @@ -1,10 +1,10 @@ var sqlite3 = require('./sqlite3'), mysql = require('./mysql'), - pgsql = require('./pgsql'); + pg = require('./pg'); module.exports = { sqlite3: sqlite3, mysql: mysql, - pgsql: pgsql -}; \ No newline at end of file + pg: pg +}; diff --git a/core/server/data/utils/clients/pgsql.js b/core/server/data/utils/clients/pg.js similarity index 90% rename from core/server/data/utils/clients/pgsql.js rename to core/server/data/utils/clients/pg.js index bbc87363bd..b907adfc4b 100644 --- a/core/server/data/utils/clients/pgsql.js +++ b/core/server/data/utils/clients/pg.js @@ -18,7 +18,7 @@ doRawFlattenAndPluck = function doRaw(query, name) { getTables = function getTables() { return doRawFlattenAndPluck( - 'SELECT table_name FROM information_schema.tables WHERE table_schema = "public"', 'table_name' + 'SELECT table_name FROM information_schema.tables WHERE table_schema = \'public\'', 'table_name' ); }; @@ -26,13 +26,13 @@ getIndexes = function getIndexes(table) { var selectIndexes = 'SELECT t.relname as table_name, i.relname as index_name, a.attname as column_name' + ' FROM pg_class t, pg_class i, pg_index ix, pg_attribute a' + ' WHERE t.oid = ix.indrelid and i.oid = ix.indexrelid and' + - ' a.attrelid = t.oid and a.attnum = ANY(ix.indkey) and t.relname = "' + table + '"'; + ' a.attrelid = t.oid and a.attnum = ANY(ix.indkey) and t.relname = \'' + table + '\''; return doRawFlattenAndPluck(selectIndexes, 'index_name'); }; getColumns = function getColumns(table) { - var selectIndexes = 'SELECT column_name FROM information_schema.columns WHERE table_name = "' + table + '"'; + var selectIndexes = 'SELECT column_name FROM information_schema.columns WHERE table_name = \'' + table + '\''; return doRawFlattenAndPluck(selectIndexes, 'column_name'); };