@elizaos/plugin-sql 1.7.1-alpha.15 → 1.7.1-alpha.17

package/dist/node/index.node.js

@@ -652,7 +652,7 @@ var init_subquery = __esm(() => {
 });
 
 // ../../node_modules/drizzle-orm/version.js
-var version = "0.45.0";
+var version = "0.45.1";
 var init_version = () => {};
 
 // ../../node_modules/drizzle-orm/tracing.js
@@ -13034,7 +13034,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             names: this.normalizeEntityNames(entity2.names),
             metadata: entity2.metadata || {}
           }));
-          await tx.insert(entityTable).values(normalizedEntities);
+          await tx.insert(entityTable).values(normalizedEntities).onConflictDoNothing();
           return true;
         });
       } catch (error) {
@@ -13264,7 +13264,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           metadata: memoryTable.metadata
         },
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(memoryTable).leftJoin(embeddingTable, eq(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions2)).orderBy(desc(memoryTable.createdAt));
+      }).from(memoryTable).leftJoin(embeddingTable, eq(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions2)).orderBy(desc(memoryTable.createdAt), desc(memoryTable.id));
       const rows = await (async () => {
         if (params.count && offset !== undefined && offset > 0) {
           return baseQuery.limit(params.count).offset(offset);
@@ -13309,7 +13309,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         roomId: memoryTable.roomId,
         unique: memoryTable.unique,
         metadata: memoryTable.metadata
-      }).from(memoryTable).where(and(...conditions2)).orderBy(desc(memoryTable.createdAt));
+      }).from(memoryTable).where(and(...conditions2)).orderBy(desc(memoryTable.createdAt), desc(memoryTable.id));
       const rows = params.limit ? await query.limit(params.limit) : await query;
       return rows.map((row) => ({
         id: row.id,
@@ -13356,7 +13356,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       const rows = await this.db.select({
         memory: memoryTable,
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(memoryTable).leftJoin(embeddingTable, eq(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions2)).orderBy(desc(memoryTable.createdAt));
+      }).from(memoryTable).leftJoin(embeddingTable, eq(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions2)).orderBy(desc(memoryTable.createdAt), desc(memoryTable.id));
       return rows.map((row) => ({
         id: row.memory.id,
         createdAt: row.memory.createdAt.getTime(),
@@ -13725,10 +13725,6 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async createMemory(memory, tableName) {
     const memoryId = memory.id ?? v4();
-    const existing = await this.getMemoryById(memoryId);
-    if (existing) {
-      return memoryId;
-    }
     if (memory.unique === undefined) {
       memory.unique = true;
       if (memory.embedding && Array.isArray(memory.embedding)) {
@@ -13746,7 +13742,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     const contentToInsert = typeof memory.content === "string" ? memory.content : JSON.stringify(memory.content ?? {});
     const metadataToInsert = typeof memory.metadata === "string" ? memory.metadata : JSON.stringify(memory.metadata ?? {});
     await this.withIsolationContext(memory.entityId, async (tx) => {
-      await tx.insert(memoryTable).values([
+      const inserted = await tx.insert(memoryTable).values([
         {
           id: memoryId,
           type: tableName,
@@ -13759,20 +13755,29 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           unique: memory.unique,
           createdAt: memory.createdAt ? new Date(memory.createdAt) : new Date
         }
-      ]);
-      if (memory.embedding && Array.isArray(memory.embedding)) {
-        const embeddingValues = {
-          id: v4(),
-          memoryId,
-          createdAt: memory.createdAt ? new Date(memory.createdAt) : new Date
-        };
-        const cleanVector = memory.embedding.map((n) => Number.isFinite(n) ? Number(n.toFixed(6)) : 0);
-        embeddingValues[this.embeddingDimension] = cleanVector;
-        await tx.insert(embeddingTable).values([embeddingValues]);
+      ]).onConflictDoNothing().returning();
+      if (inserted.length > 0 && memory.embedding && Array.isArray(memory.embedding)) {
+        await this.upsertEmbedding(tx, memoryId, memory.embedding);
       }
     });
     return memoryId;
   }
+  async upsertEmbedding(tx, memoryId, embedding) {
+    const cleanVector = embedding.map((n) => Number.isFinite(n) ? Number(n.toFixed(6)) : 0);
+    const existingEmbedding = await tx.select({ id: embeddingTable.id }).from(embeddingTable).where(eq(embeddingTable.memoryId, memoryId)).limit(1);
+    if (existingEmbedding.length > 0) {
+      const updateValues = {};
+      updateValues[this.embeddingDimension] = cleanVector;
+      await tx.update(embeddingTable).set(updateValues).where(eq(embeddingTable.memoryId, memoryId));
+    } else {
+      const embeddingValues = {
+        id: v4(),
+        memoryId
+      };
+      embeddingValues[this.embeddingDimension] = cleanVector;
+      await tx.insert(embeddingTable).values([embeddingValues]);
+    }
+  }
   async updateMemory(memory) {
     return this.withDatabase(async () => {
       try {
@@ -13791,20 +13796,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             }).where(eq(memoryTable.id, memory.id));
           }
           if (memory.embedding && Array.isArray(memory.embedding)) {
-            const cleanVector = memory.embedding.map((n) => Number.isFinite(n) ? Number(n.toFixed(6)) : 0);
-            const existingEmbedding = await tx.select({ id: embeddingTable.id }).from(embeddingTable).where(eq(embeddingTable.memoryId, memory.id)).limit(1);
-            if (existingEmbedding.length > 0) {
-              const updateValues = {};
-              updateValues[this.embeddingDimension] = cleanVector;
-              await tx.update(embeddingTable).set(updateValues).where(eq(embeddingTable.memoryId, memory.id));
-            } else {
-              const embeddingValues = {
-                id: v4(),
-                memoryId: memory.id
-              };
-              embeddingValues[this.embeddingDimension] = cleanVector;
-              await tx.insert(embeddingTable).values([embeddingValues]);
-            }
+            await this.upsertEmbedding(tx, memory.id, memory.embedding);
           }
         });
         return true;
@@ -13944,9 +13936,8 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         agentId: this.agentId,
         id: room.id || v4()
       }));
-      const insertedRooms = await this.db.insert(roomTable).values(roomsWithIds).onConflictDoNothing().returning();
-      const insertedIds = insertedRooms.map((r) => r.id);
-      return insertedIds;
+      await this.db.insert(roomTable).values(roomsWithIds).onConflictDoNothing();
+      return roomsWithIds.map((r) => r.id);
     });
   }
   async deleteRoom(roomId) {
@@ -14244,7 +14235,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         ...world,
         id: newWorldId,
         name: world.name || ""
-      });
+      }).onConflictDoNothing();
       return newWorldId;
     });
   }
@@ -14516,16 +14507,14 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         createdAt: now,
         updatedAt: now
       };
-      await this.db.transaction(async (tx) => {
-        await tx.insert(channelTable).values(channelToInsert);
-        if (participantIds && participantIds.length > 0) {
-          const participantValues = participantIds.map((entityId) => ({
-            channelId: newId,
-            entityId
-          }));
-          await tx.insert(channelParticipantsTable).values(participantValues).onConflictDoNothing();
-        }
-      });
+      await this.db.insert(channelTable).values(channelToInsert).onConflictDoNothing();
+      if (participantIds && participantIds.length > 0) {
+        const participantValues = participantIds.map((entityId) => ({
+          channelId: newId,
+          entityId
+        }));
+        await this.db.insert(channelParticipantsTable).values(participantValues).onConflictDoNothing();
+      }
       return channelToInsert;
     });
   }
@@ -14758,7 +14747,7 @@ class PgliteDatabaseAdapter extends BaseDrizzleAdapter {
     this.db = drizzle(this.manager.getConnection());
   }
   async withIsolationContext(_entityId, callback) {
-    return this.db.transaction(callback);
+    return callback(this.db);
   }
   async getEntityByIds(entityIds) {
     return this.getEntitiesByIds(entityIds);
@@ -14905,51 +14894,6 @@ class PgDatabaseAdapter extends BaseDrizzleAdapter {
   async getConnection() {
     return this.manager.getConnection();
   }
-  async createAgent(agent) {
-    return super.createAgent(agent);
-  }
-  getAgent(agentId) {
-    return super.getAgent(agentId);
-  }
-  updateAgent(agentId, agent) {
-    return super.updateAgent(agentId, agent);
-  }
-  deleteAgent(agentId) {
-    return super.deleteAgent(agentId);
-  }
-  createEntities(entities) {
-    return super.createEntities(entities);
-  }
-  getEntitiesByIds(entityIds) {
-    return super.getEntitiesByIds(entityIds).then((result) => result || []);
-  }
-  updateEntity(entity2) {
-    return super.updateEntity(entity2);
-  }
-  createMemory(memory, tableName) {
-    return super.createMemory(memory, tableName);
-  }
-  getMemoryById(memoryId) {
-    return super.getMemoryById(memoryId);
-  }
-  updateMemory(memory) {
-    return super.updateMemory(memory);
-  }
-  deleteMemory(memoryId) {
-    return super.deleteMemory(memoryId);
-  }
-  createComponent(component) {
-    return super.createComponent(component);
-  }
-  getComponent(entityId, type, worldId, sourceEntityId) {
-    return super.getComponent(entityId, type, worldId, sourceEntityId);
-  }
-  updateComponent(component) {
-    return super.updateComponent(component);
-  }
-  deleteComponent(componentId) {
-    return super.deleteComponent(componentId);
-  }
 }
 
 // ../../node_modules/drizzle-orm/node-postgres/driver.js
@@ -14971,7 +14915,6 @@ init_sql();
 init_tracing();
 init_utils();
 var { Pool, types: types3 } = pg;
-var NativePool = pg.native ? pg.native.Pool : undefined;
 
 class NodePgPreparedQuery extends PgPreparedQuery {
   constructor(client, queryString, params, logger13, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper) {
@@ -15129,7 +15072,8 @@ class NodePgSession extends PgSession {
     return new NodePgPreparedQuery(this.client, query.sql, query.params, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
   }
   async transaction(transaction, config) {
-    const session2 = this.client instanceof Pool || NativePool && this.client instanceof NativePool ? new NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
+    const isPool = this.client instanceof Pool || Object.getPrototypeOf(this.client).constructor.name.includes("Pool");
+    const session2 = isPool ? new NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
     const tx = new NodePgTransaction(this.dialect, session2, this.schema);
     await tx.execute(sql`begin${config ? sql` ${tx.getTransactionConfigSQL(config)}` : undefined}`);
     try {
@@ -15140,9 +15084,8 @@ class NodePgSession extends PgSession {
       await tx.execute(sql`rollback`);
       throw error;
     } finally {
-      if (this.client instanceof Pool || NativePool && this.client instanceof NativePool) {
+      if (isPool)
         session2.client.release();
-      }
     }
   }
   async count(sql22) {
@@ -15386,51 +15329,6 @@ class NeonDatabaseAdapter extends BaseDrizzleAdapter {
   async getConnection() {
     return this.manager.getConnection();
   }
-  async createAgent(agent) {
-    return super.createAgent(agent);
-  }
-  getAgent(agentId) {
-    return super.getAgent(agentId);
-  }
-  updateAgent(agentId, agent) {
-    return super.updateAgent(agentId, agent);
-  }
-  deleteAgent(agentId) {
-    return super.deleteAgent(agentId);
-  }
-  createEntities(entities) {
-    return super.createEntities(entities);
-  }
-  getEntitiesByIds(entityIds) {
-    return super.getEntitiesByIds(entityIds).then((result) => result || []);
-  }
-  updateEntity(entity2) {
-    return super.updateEntity(entity2);
-  }
-  createMemory(memory, tableName) {
-    return super.createMemory(memory, tableName);
-  }
-  getMemoryById(memoryId) {
-    return super.getMemoryById(memoryId);
-  }
-  updateMemory(memory) {
-    return super.updateMemory(memory);
-  }
-  deleteMemory(memoryId) {
-    return super.deleteMemory(memoryId);
-  }
-  createComponent(component) {
-    return super.createComponent(component);
-  }
-  getComponent(entityId, type, worldId, sourceEntityId) {
-    return super.getComponent(entityId, type, worldId, sourceEntityId);
-  }
-  updateComponent(component) {
-    return super.updateComponent(component);
-  }
-  deleteComponent(componentId) {
-    return super.deleteComponent(componentId);
-  }
 }
 
 // ../../node_modules/@neondatabase/serverless/index.mjs
@@ -20853,5 +20751,5 @@ export {
   DatabaseMigrationService
 };
 
-//# debugId=E4C1FB1BD2EABD5064756E2164756E21
+//# debugId=0F9065BB487B8FE864756E2164756E21
 //# sourceMappingURL=index.node.js.map