Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-11-17 11:12:19 +01:00
parent 5fcfc4dc2c
commit 8eebe3215a
8 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/package-shared/functions/web-app/db/grab-user-resource/index.d.ts vendored
View File

@ -5,10 +5,7 @@ export default function dbGrabUserResource<T extends {
batch: T[] | null;
single: T | null;
debug: {
queryObject: {
sql?: string;
params?: string[];
} | undefined;
queryObject: import("../../../../types").ResponseQueryObject | undefined;
error: any;
msg: string | undefined;
};

3
dist/package-shared/shell/createDbFromSchema/grab-required-database-schemas.js vendored
View File

@ -109,8 +109,9 @@ function grabPrimaryRequiredDbSchema({ userId, dbId, dbSlug }) {
// return existingSchemaInMainJSON;
// }
// }
console.log(`userSchemaDir not found!`);
console.log(`Coudln't grab Required DB Schema!`);
console.log(`userId`, userId);
console.log(`dbId`, dbId);
return undefined;
}
function findDbNameInSchemaDir({ userId, dbName, }) {

10
dist/package-shared/types/index.d.ts vendored
View File

@ -1402,6 +1402,10 @@ export type PagePropsType = {
docsPages?: DocsLinkType[] | null;
docsPageEditURL?: string | null;
};
export type ResponseQueryObject = {
sql?: string;
params?: string[];
};
export type APIResponseObject<T extends any = any> = {
success: boolean;
payload?: T;
@ -1411,10 +1415,8 @@ export type APIResponseObject<T extends any = any> = {
payloadThumbnailURL?: string;
error?: any;
msg?: string;
queryObject?: {
sql?: string;
params?: string[];
};
queryObject?: ResponseQueryObject;
countQueryObject?: ResponseQueryObject;
status?: number;
count?: number;
errors?: DSQLErrorObject[];

8
dist/package-shared/utils/data-fetching/crud-get.js vendored
View File

@ -40,7 +40,7 @@ function default_1(_a) {
dbFullName,
})
: undefined;
if (count && countQueryObject) {
if ((count || countOnly) && countQueryObject) {
connQueries.push({
query: countQueryObject.string,
values: countQueryObject.values,
@ -81,12 +81,16 @@ function default_1(_a) {
sql: queryObject === null || queryObject === void 0 ? void 0 : queryObject.string,
params: queryObject === null || queryObject === void 0 ? void 0 : queryObject.values,
},
countQueryObject: {
sql: countQueryObject === null || countQueryObject === void 0 ? void 0 : countQueryObject.string,
params: countQueryObject === null || countQueryObject === void 0 ? void 0 : countQueryObject.values,
},
count: isSuccess
? ((_c = (_b = res[1]) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c["COUNT(*)"])
? res[1][0]["COUNT(*)"]
: ((_e = (_d = res[0]) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e["COUNT(*)"])
? res[0][0]["COUNT(*)"]
: undefined
: 0
: undefined,
};
});

3
package-shared/shell/createDbFromSchema/grab-required-database-schemas.ts
View File

@ -129,8 +129,9 @@ export function grabPrimaryRequiredDbSchema({ userId, dbId, dbSlug }: Params) {
// }
// }
console.log(`userSchemaDir not found!`);
console.log(`Coudln't grab Required DB Schema!`);
console.log(`userId`, userId);
console.log(`dbId`, dbId);
return undefined;
}

11
package-shared/types/index.ts
View File

@ -1633,6 +1633,11 @@ export type PagePropsType = {
docsPageEditURL?: string | null;
};
export type ResponseQueryObject = {
sql?: string;
params?: string[];
};
export type APIResponseObject<T extends any = any> = {
success: boolean;
payload?: T;
@ -1642,10 +1647,8 @@ export type APIResponseObject<T extends any = any> = {
payloadThumbnailURL?: string;
error?: any;
msg?: string;
queryObject?: {
sql?: string;
params?: string[];
};
queryObject?: ResponseQueryObject;
countQueryObject?: ResponseQueryObject;
status?: number;
count?: number;
errors?: DSQLErrorObject[];

8
package-shared/utils/data-fetching/crud-get.ts
View File

@ -44,7 +44,7 @@ export default async function <
})
: undefined;
if (count && countQueryObject) {
if ((count || countOnly) && countQueryObject) {
connQueries.push({
query: countQueryObject.string,
values: countQueryObject.values,
@ -88,12 +88,16 @@ export default async function <
sql: queryObject?.string,
params: queryObject?.values,
},
countQueryObject: {
sql: countQueryObject?.string,
params: countQueryObject?.values,
},
count: isSuccess
? res[1]?.[0]?.["COUNT(*)"]
? res[1][0]["COUNT(*)"]
: res[0]?.[0]?.["COUNT(*)"]
? res[0][0]["COUNT(*)"]
: undefined
: 0
: undefined,
};
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@moduletrace/datasquirel",
"version": "5.4.1",
"version": "5.4.2",
"description": "Cloud-based SQL data management tool",
"main": "dist/index.js",
"bin": {