Changed to table creation

- changed creation and update to transaction type
- fixed creation file
pull/1/head
Trivernis 5 years ago
parent bf3be7d129
commit 2ed4f9793a

@ -95,7 +95,18 @@ export class QueryHelper {
if (this.tableCreationFile) { if (this.tableCreationFile) {
logger.info("Creating nonexistent tables..."); logger.info("Creating nonexistent tables...");
const tableSql = await fsx.readFile(this.tableCreationFile, "utf-8"); const tableSql = await fsx.readFile(this.tableCreationFile, "utf-8");
await this.query({text: tableSql}); const trans = await this.createTransaction();
await trans.begin();
try {
await trans.query({text: tableSql});
await trans.commit();
} catch (err) {
globals.logger.error(`Error on table creation ${err.message}`);
globals.logger.debug(err.stack);
await trans.rollback();
} finally {
trans.release();
}
} }
} }
@ -106,7 +117,18 @@ export class QueryHelper {
if (this.tableUpdateFile) { if (this.tableUpdateFile) {
logger.info("Updating table definitions..."); logger.info("Updating table definitions...");
const tableSql = await fsx.readFile(this.tableUpdateFile, "utf-8"); const tableSql = await fsx.readFile(this.tableUpdateFile, "utf-8");
await this.query({text: tableSql}); const trans = await this.createTransaction();
await trans.begin();
try {
await trans.query({text: tableSql});
await trans.commit();
} catch (err) {
globals.logger.error(`Error on table update ${err.message}`);
globals.logger.debug(err.stack);
await trans.rollback();
} finally {
trans.release();
}
} }
} }

@ -15,20 +15,6 @@ DO $$BEGIN
END $BODY$; END $BODY$;
END IF; END IF;
IF NOT function_exists('cast_to_votetype') THEN
CREATE FUNCTION cast_to_votetype(text) RETURNS votetype LANGUAGE plpgsql AS $BODY$
BEGIN
RETURN CASE WHEN $1::votetype IS NULL THEN 'UPVOTE' ELSE $1::votetype END;
END $BODY$;
END IF;
IF NOT function_exists('cast_to_posttype') THEN
CREATE FUNCTION cast_to_posttype(text) RETURNS posttype LANGUAGE plpgsql AS $BODY$
BEGIN
RETURN CASE WHEN $1::posttype IS NULL THEN 'MISC' ELSE $1::posttype END;
END $BODY$;
END IF;
END$$; END$$;
--create types --create types
@ -48,6 +34,26 @@ DO $$ BEGIN
END$$; END$$;
-- create functions relying on types
DO $$ BEGIN
IF NOT function_exists('cast_to_votetype') THEN
CREATE FUNCTION cast_to_votetype(text) RETURNS votetype LANGUAGE plpgsql AS $BODY$
BEGIN
RETURN CASE WHEN $1::votetype IS NULL THEN 'UPVOTE' ELSE $1::votetype END;
END $BODY$;
END IF;
IF NOT function_exists('cast_to_posttype') THEN
CREATE FUNCTION cast_to_posttype(text) RETURNS posttype LANGUAGE plpgsql AS $BODY$
BEGIN
RETURN CASE WHEN $1::posttype IS NULL THEN 'MISC' ELSE $1::posttype END;
END $BODY$;
END IF;
END$$;
-- create tables -- create tables
DO $$ BEGIN DO $$ BEGIN

Loading…
Cancel
Save