Browse Source

prevent sql relationship delete from erroring

gh-pages
Martin McKeaveney 5 years ago
parent
commit
0df6d24edf
  1. 2
      packages/server/package.json
  2. 4
      packages/server/src/api/controllers/row/ExternalRequest.ts
  3. 1138
      packages/server/yarn.lock
  4. 2
      packages/standard-components/src/forms/OptionsField.svelte

2
packages/server/package.json

@ -96,7 +96,7 @@
"lodash": "4.17.21", "lodash": "4.17.21",
"mongodb": "3.6.3", "mongodb": "3.6.3",
"mssql": "6.2.3", "mssql": "6.2.3",
"mysql": "2.18.1", "mysql": "^2.18.1",
"node-fetch": "2.6.0", "node-fetch": "2.6.0",
"open": "7.3.0", "open": "7.3.0",
"pg": "8.5.1", "pg": "8.5.1",

4
packages/server/src/api/controllers/row/ExternalRequest.ts

@ -264,7 +264,7 @@ module External {
} }
outputProcessing( outputProcessing(
rows: Row[], rows: Row[] = [],
table: Table, table: Table,
relationships: RelationshipsJson[] relationships: RelationshipsJson[]
) { ) {
@ -524,7 +524,7 @@ module External {
// can't really use response right now // can't really use response right now
const response = await makeExternalQuery(appId, json) const response = await makeExternalQuery(appId, json)
// handle many to many relationships now if we know the ID (could be auto increment) // handle many to many relationships now if we know the ID (could be auto increment)
if (processed.manyRelationships) { if (processed.manyRelationships && response) {
await this.handleManyRelationships( await this.handleManyRelationships(
response[0], response[0],
processed.manyRelationships processed.manyRelationships

1138
packages/server/yarn.lock

File diff suppressed because it is too large

2
packages/standard-components/src/forms/OptionsField.svelte

@ -29,6 +29,8 @@
valueColumn, valueColumn,
customOptions customOptions
) )
$: console.log(options)
</script> </script>
<Field <Field

Loading…
Cancel
Save