Updates
This commit is contained in:
@@ -26,7 +26,9 @@ function importMariadbDatabase(_a) {
|
||||
const finalMariadbUser = mariadbUser || process.env.DSQL_DB_USERNAME;
|
||||
const finalMariadbHost = mariadbHost || process.env.DSQL_DB_HOST;
|
||||
const finalMariadbPass = mariadbPass || process.env.DSQL_DB_PASSWORD;
|
||||
yield (0, conn_db_handler_1.default)(null, `CREATE DATABASE IF NOT EXISTS ${dbFullName}`);
|
||||
yield (0, conn_db_handler_1.default)({
|
||||
query: `CREATE DATABASE IF NOT EXISTS ${dbFullName}`,
|
||||
});
|
||||
const cmd = `${mysqlPath} -u ${finalMariadbUser} -h ${finalMariadbHost} -p"${finalMariadbPass}" ${dbFullName} < ${targetFilePath}`;
|
||||
let execSyncOptions = {
|
||||
encoding: "utf-8",
|
||||
|
||||
+1
-1
@@ -3,4 +3,4 @@ export default function <T extends {
|
||||
[key: string]: any;
|
||||
} = {
|
||||
[key: string]: any;
|
||||
}>({ table, query, count, countOnly, dbFullName, tableSchema, }: Omit<DsqlCrudParam<T>, "action" | "data" | "sanitize">): Promise<APIResponseObject>;
|
||||
}>({ table, query, count, countOnly, dbFullName, tableSchema, dbConfig, }: Omit<DsqlCrudParam<T>, "action" | "data" | "sanitize">): Promise<APIResponseObject>;
|
||||
|
||||
+5
-2
@@ -18,7 +18,7 @@ const conn_db_handler_1 = __importDefault(require("../db/conn-db-handler"));
|
||||
const check_array_depth_1 = __importDefault(require("../check-array-depth"));
|
||||
const parseDbResults_1 = __importDefault(require("../../functions/backend/parseDbResults"));
|
||||
function default_1(_a) {
|
||||
return __awaiter(this, arguments, void 0, function* ({ table, query, count, countOnly, dbFullName, tableSchema, }) {
|
||||
return __awaiter(this, arguments, void 0, function* ({ table, query, count, countOnly, dbFullName, tableSchema, dbConfig, }) {
|
||||
var _b, _c, _d, _e;
|
||||
let queryObject;
|
||||
queryObject = (0, sql_generator_1.default)({
|
||||
@@ -54,7 +54,10 @@ function default_1(_a) {
|
||||
},
|
||||
];
|
||||
}
|
||||
const res = yield (0, conn_db_handler_1.default)(undefined, connQueries);
|
||||
const res = yield (0, conn_db_handler_1.default)({
|
||||
query: connQueries,
|
||||
dsqlConnOpts: { config: dbConfig },
|
||||
});
|
||||
const parsedRes = (0, check_array_depth_1.default)(res, 2)
|
||||
? (0, parseDbResults_1.default)({ unparsedResults: res[0], tableSchema })
|
||||
: res[0];
|
||||
|
||||
+8
-2
@@ -20,7 +20,7 @@ const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEn
|
||||
const updateDbEntry_1 = __importDefault(require("../../functions/backend/db/updateDbEntry"));
|
||||
function dsqlCrud(params) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const { action, data, table, targetValue, sanitize, targetField, targetId, dbFullName, deleteData, batchData, deleteKeyValues, debug, tableSchema, deleteKeyValuesOperator, } = params;
|
||||
const { action, data, table, targetValue, sanitize, targetField, targetId, dbFullName, deleteData, batchData, deleteKeyValues, debug, tableSchema, deleteKeyValuesOperator, dbConfig, } = params;
|
||||
const finalData = (sanitize ? sanitize({ data }) : data);
|
||||
const finalBatchData = (sanitize ? sanitize({ batchData }) : batchData);
|
||||
switch (action) {
|
||||
@@ -36,6 +36,7 @@ function dsqlCrud(params) {
|
||||
dbFullName,
|
||||
debug,
|
||||
tableSchema,
|
||||
dbConfig,
|
||||
});
|
||||
return INSERT_RESULT;
|
||||
case "update":
|
||||
@@ -48,6 +49,7 @@ function dsqlCrud(params) {
|
||||
identifierValue: String(targetValue || targetId),
|
||||
debug,
|
||||
tableSchema,
|
||||
dbConfig,
|
||||
});
|
||||
return UPDATE_RESULT;
|
||||
case "delete":
|
||||
@@ -62,7 +64,11 @@ function dsqlCrud(params) {
|
||||
deleteKeyValues,
|
||||
deleteKeyValuesOperator,
|
||||
});
|
||||
const res = (yield (0, conn_db_handler_1.default)(undefined, deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.query, deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.values));
|
||||
const res = (yield (0, conn_db_handler_1.default)({
|
||||
query: deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.query,
|
||||
values: deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.values,
|
||||
dsqlConnOpts: { config: dbConfig },
|
||||
}));
|
||||
return {
|
||||
success: Boolean(res.affectedRows),
|
||||
payload: res,
|
||||
|
||||
+18
-14
@@ -1,4 +1,4 @@
|
||||
import { DSQLErrorObject } from "../../types";
|
||||
import { DsqlConnectionParam, DSQLErrorObject } from "../../types";
|
||||
import mariadb, { ConnectionConfig } from "mariadb";
|
||||
export type ConnDBHandlerQueryObject = {
|
||||
query: string;
|
||||
@@ -9,22 +9,26 @@ type Return<ReturnType = any> = ReturnType | ReturnType[] | null | {
|
||||
errors?: DSQLErrorObject[];
|
||||
config?: ConnectionConfig;
|
||||
};
|
||||
export type ConnectionDbHandlerParams = {
|
||||
/**
|
||||
* MariaDB Connection
|
||||
*/
|
||||
conn?: mariadb.Connection | null;
|
||||
/**
|
||||
* String Or `ConnDBHandlerQueryObject` Array
|
||||
*/
|
||||
query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[];
|
||||
/**
|
||||
* Array of Values to Sanitize and Inject
|
||||
*/
|
||||
values?: ConnDBHandlerQueryObject["values"];
|
||||
debug?: boolean;
|
||||
dsqlConnOpts?: DsqlConnectionParam;
|
||||
};
|
||||
/**
|
||||
* # Run Query From MySQL Connection
|
||||
* @description Run a query from a pre-existing MySQL/Mariadb Connection
|
||||
* setup with `serverless-mysql` npm module
|
||||
*/
|
||||
export default function connDbHandler<ReturnType = any>(
|
||||
/**
|
||||
* MariaDB Connection
|
||||
*/
|
||||
conn?: mariadb.Connection | null,
|
||||
/**
|
||||
* String Or `ConnDBHandlerQueryObject` Array
|
||||
*/
|
||||
query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[],
|
||||
/**
|
||||
* Array of Values to Sanitize and Inject
|
||||
*/
|
||||
values?: ConnDBHandlerQueryObject["values"], debug?: boolean): Promise<Return<ReturnType>>;
|
||||
export default function connDbHandler<ReturnType = any>({ conn, debug, query, values, dsqlConnOpts, }: ConnectionDbHandlerParams): Promise<Return<ReturnType>>;
|
||||
export {};
|
||||
|
||||
+3
-15
@@ -20,21 +20,9 @@ const grab_dsql_connection_1 = __importDefault(require("../grab-dsql-connection"
|
||||
* @description Run a query from a pre-existing MySQL/Mariadb Connection
|
||||
* setup with `serverless-mysql` npm module
|
||||
*/
|
||||
function connDbHandler(
|
||||
/**
|
||||
* MariaDB Connection
|
||||
*/
|
||||
conn,
|
||||
/**
|
||||
* String Or `ConnDBHandlerQueryObject` Array
|
||||
*/
|
||||
query,
|
||||
/**
|
||||
* Array of Values to Sanitize and Inject
|
||||
*/
|
||||
values, debug) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const finalConnection = conn || (yield (0, grab_dsql_connection_1.default)());
|
||||
function connDbHandler(_a) {
|
||||
return __awaiter(this, arguments, void 0, function* ({ conn, debug, query, values, dsqlConnOpts, }) {
|
||||
const finalConnection = conn || (yield (0, grab_dsql_connection_1.default)(dsqlConnOpts));
|
||||
try {
|
||||
if (!finalConnection)
|
||||
throw new Error("No Connection Found!");
|
||||
|
||||
Reference in New Issue
Block a user