feat: support tables without primary key

decentraland · May 28, 2019 · 0d6e9a0 · 0d6e9a0
1 parent 5b56340
commit 0d6e9a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Model.ts b/src/Model.ts
@@ -189,7 +189,7 @@ export class Model<T> {
     )
     const newRow = insertion.rows[0]
 
-    if (newRow) {
+    if (newRow && this.primaryKey) {
       row[this.primaryKey] = newRow[this.primaryKey]
     }
 

diff --git a/src/db/postgres.ts b/src/db/postgres.ts
@@ -106,7 +106,7 @@ export class Postgres {
   async insert(
     tableName: string,
     changes: QueryPart,
-    primaryKey: string = 'id',
+    primaryKey: string = '',
     onConflict: OnConflict = { target: [], changes: {} }
   ): Promise<any> {
     if (!changes) {
@@ -117,6 +117,7 @@ export class Postgres {
 
     const values = Object.values(changes)
     const conflictValues = Object.values(onConflict.changes || {})
+    const returning = primaryKey ? `RETURNING ${primaryKey}` : ''
 
     return this.client.query(
       `INSERT INTO ${tableName}(
@@ -125,7 +126,7 @@ export class Postgres {
         ${this.toValuePlaceholders(changes)}
       )
         ${this.toOnConflictUpsert(onConflict, values.length)}
-        RETURNING ${primaryKey}`,
+        ${returning}`,
       values.concat(conflictValues)
     )
   }
@@ -212,13 +213,14 @@ export class Postgres {
     rows: string[],
     options: { sequenceName?: string; primaryKey?: string } = {}
   ): Promise<void> {
-    const { sequenceName = `${tableName}_id_seq`, primaryKey = 'id' } = options
+    const { sequenceName = `${tableName}_id_seq`, primaryKey = '' } = options
+    const primaryKeyClause = primaryKey ? `PRIMARY KEY ("${primaryKey}")` : ''
 
     if (sequenceName) await this.createSequence(sequenceName)
 
     await this.client.query(`CREATE TABLE IF NOT EXISTS "${tableName}" (
       ${rows}
-      PRIMARY KEY ("${primaryKey}")
+      ${primaryKeyClause}
     );`)
 
     if (sequenceName) await this.alterSequenceOwnership(sequenceName, tableName)