self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-06-08 02:36:22 +02:00
Code Issues Releases Activity
immich/server/patches/postgres+3.4.5.patch

49 lines
2.7 KiB
Diff
Raw Normal View History

fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
diff --git a/node_modules/postgres/cf/src/connection.js b/node_modules/postgres/cf/src/connection.js
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
index ee8b1e6..acf4566 100644
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
--- a/node_modules/postgres/cf/src/connection.js
+++ b/node_modules/postgres/cf/src/connection.js
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
@@ -387,8 +387,10 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
}
function queryError(query, err) {
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
+ if (!query || typeof query !== 'object' || !query.reject) throw err
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
+
'query' in err || 'parameters' in err || Object.defineProperties(err, {
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
- stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
+ stack: { value: err.stack + (query.origin || '').replace(/.*\n/, '\n'), enumerable: options.debug },
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
query: { value: query.string, enumerable: options.debug },
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
parameters: { value: query.parameters, enumerable: options.debug },
args: { value: query.args, enumerable: options.debug },
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
diff --git a/node_modules/postgres/cjs/src/connection.js b/node_modules/postgres/cjs/src/connection.js
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
index f7f58d1..b7f2d65 100644
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
--- a/node_modules/postgres/cjs/src/connection.js
+++ b/node_modules/postgres/cjs/src/connection.js
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
@@ -385,8 +385,10 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
}
function queryError(query, err) {
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
+ if (!query || typeof query !== 'object' || !query.reject) throw err
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
+
'query' in err || 'parameters' in err || Object.defineProperties(err, {
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
- stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
+ stack: { value: err.stack + (query.origin || '').replace(/.*\n/, '\n'), enumerable: options.debug },
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
query: { value: query.string, enumerable: options.debug },
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
parameters: { value: query.parameters, enumerable: options.debug },
args: { value: query.args, enumerable: options.debug },
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
diff --git a/node_modules/postgres/src/connection.js b/node_modules/postgres/src/connection.js
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
index 97cc97e..26f508e 100644
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
--- a/node_modules/postgres/src/connection.js
+++ b/node_modules/postgres/src/connection.js
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
@@ -385,8 +385,10 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
}
function queryError(query, err) {
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
+ if (!query || typeof query !== 'object' || !query.reject) throw err
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
+
'query' in err || 'parameters' in err || Object.defineProperties(err, {
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
- stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
+ stack: { value: err.stack + (query.origin || '').replace(/.*\n/, '\n'), enumerable: options.debug },
fix(server): Postgres error pretty printing (#17204) * add patch-package to dev dependencies this allows us to patch upstream packages without waiting for PRs to be merged (or not!). Patch-package does a pretty good job of notifying if upstream does a change to invalidate the patch (its a git patch under the hood). * Patch implementation of https://github.com/porsager/postgres/pull/944 This PR has not been merged by upstream and helps produce verbose error messages when postgres fails to connect (usually incorrect credentials). This is in contrast to error messages such as `TypeError: Cannot read properties of undefined (reading 'replace'), stack: TypeError: Cannot read properties of undefined (reading 'replace')` * have postinstall only run when not installing a global package (such as immich-cli in the Docker build)
2025-03-31 09:34:43 -05:00
query: { value: query.string, enumerable: options.debug },
fix: patch-package install in docker build and better postgres patch (#17523) * always patch package when running npm i, install immich CLI outside of directory so post install doesnt run * handles case where query is an object and defined but origin is not. * move patch-package from a dev dependency to a normal dependency. Also copy the patches folder for the docker build to use and patch with * fix Dockerfile * use query.reject instead of throw for queryError * package-lock to reflect the dev dependency change * dont throw the error, just provide an empty string for query.origin if it does not exist * remove npm link and demote patch-package back to a dev dependency * modify patch to add defensive check to catch queries that will fail to parse and reject
2025-04-10 11:43:35 -05:00
parameters: { value: query.parameters, enumerable: options.debug },
args: { value: query.args, enumerable: options.debug },
Reference in New Issue Copy Permalink