mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter synced 2024-11-15 06:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not delegate to select on read like ever that is really dumb

Browse Source
This commit is contained in:
KernelDeimos 2024-06-16 20:57:32 -04:00
parent 9b39309e18
commit a2a10b94be
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/backend/src/drivers/EntityStoreImplementation.js
View File

@ -67,15 +67,13 @@ const _fetch_based_on_complex_id = async (self, id) => {
let predicate = new And({ children: key_eqs }); let predicate = new And({ children: key_eqs });
// Perform a select // Perform a select
const entities = await svc_es.select({ predicate }); const entity = await svc_es.read({ predicate });
if ( entities.length === 0 ) { if ( ! entity ) {
return null; return null;
} }
console.log('WHAT ISAGERSGAREWHGwr', entities)
// Ensure there is only one result // Ensure there is only one result
return entities[0]; return entity;
} }
const _fetch_based_on_either_id = async (self, uid, id) => { const _fetch_based_on_either_id = async (self, uid, id) => {

29
packages/backend/src/om/entitystorage/SQLES.js
View File

@ -44,22 +44,41 @@ class SQLES extends BaseES {
} }
}, },
async read (uid) { async read (uid) {
const id_prop = this.om.properties[this.om.primary_identifier];
const [stmt_where, where_vals] = await (async () => {
if ( typeof uid !== 'object' ) {
const id_prop =
this.om.properties[this.om.primary_identifier];
let id_col = let id_col =
id_prop.descriptor.sql?.column_name ?? id_prop.name; id_prop.descriptor.sql?.column_name ?? id_prop.name;
console.log('CALLING READ WITH UID ', uid);
// Temporary hack until multiple identifiers are supported // Temporary hack until multiple identifiers are supported
// (allows us to query using an internal ID; users can't do this) // (allows us to query using an internal ID; users can't do this)
if ( typeof uid === 'number' ) { if ( typeof uid === 'number' ) {
id_col = 'id'; id_col = 'id';
} }
return [` WHERE ${id_col} = ?`, [uid]]
}
if ( ! uid.hasOwnProperty('predicate') ) {
throw new Error(
'SQLES.read does not understand this input: ' +
'object with no predicate property',
);
}
let predicate = uid.predicate; // uid is actually a predicate
if ( predicate instanceof Predicate ) {
predicate = await this.om_to_sql_condition_(predicate);
}
const stmt_where = ` WHERE ${predicate.sql} LIMIT 1` ;
const where_vals = predicate.values;
return [stmt_where, where_vals];
})();
const stmt = const stmt =
`SELECT * FROM ${this.om.sql.table_name} WHERE ${id_col} = ?`; `SELECT * FROM ${this.om.sql.table_name}${stmt_where}`;
const rows = await this.db.read( const rows = await this.db.read(
stmt, [uid] stmt, where_vals
); );
if ( rows.length === 0 ) { if ( rows.length === 0 ) {