fixing fallback view and some minor bug related to rowid fallback

outerbase · Dec 2, 2024 · ce659ef · ce659ef
1 parent e67a326
commit ce659ef
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/src/drivers/base-driver.ts b/src/drivers/base-driver.ts
@@ -153,6 +153,7 @@ export interface DatabaseTableSchema {
   constraints?: DatabaseTableColumnConstraint[];
   createScript?: string;
   fts5?: DatabaseTableFts5;
+  type?: "table" | "view";
   withoutRowId?: boolean;
   strict?: boolean;
 }
@@ -213,6 +214,7 @@ export interface DriverFlags {
   // data when update
   supportInsertReturning: boolean;
   supportUpdateReturning: boolean;
+  supportRowId: boolean;
 }
 
 export interface DatabaseTableColumnChange {

diff --git a/src/drivers/common-sql-imp.ts b/src/drivers/common-sql-imp.ts
@@ -41,7 +41,8 @@ export default abstract class CommonSQLImplement extends BaseDriver {
           schemaName,
           tableName,
           op.values,
-          this.getFlags().supportInsertReturning
+          this.getFlags().supportInsertReturning,
+          this.getFlags().supportRowId
         );
 
       if (op.operation === "DELETE")
@@ -53,7 +54,8 @@ export default abstract class CommonSQLImplement extends BaseDriver {
         tableName,
         op.values,
         op.where,
-        this.getFlags().supportInsertReturning
+        this.getFlags().supportInsertReturning,
+        this.getFlags().supportRowId
       );
     });
 

diff --git a/src/drivers/mysql/mysql-driver.ts b/src/drivers/mysql/mysql-driver.ts
@@ -55,6 +55,7 @@ export default abstract class MySQLLikeDriver extends CommonSQLImplement {
       supportCreateUpdateTable: false,
       dialect: "mysql",
 
+      supportRowId: false,
       supportInsertReturning: false,
       supportUpdateReturning: false,
     };

diff --git a/src/drivers/postgres/postgres-driver.ts b/src/drivers/postgres/postgres-driver.ts
@@ -67,6 +67,7 @@ export default abstract class PostgresLikeDriver extends CommonSQLImplement {
       defaultSchema: "public",
       dialect: "postgres",
       optionalSchema: false,
+      supportRowId: false,
       supportBigInt: false,
       supportModifyColumn: false,
       mismatchDetection: false,

diff --git a/src/drivers/query-builder.ts b/src/drivers/query-builder.ts
@@ -65,13 +65,14 @@ export function insertInto(
   schema: string,
   table: string,
   value: Record<string, unknown>,
-  supportReturning: boolean
+  supportReturning: boolean,
+  supportRowId: boolean
 ) {
   return [
     "INSERT INTO",
     `${dialect.escapeId(schema)}.${dialect.escapeId(table)}`,
     generateInsertValue(dialect, value),
-    supportReturning ? "RETURNING *" : "",
+    supportReturning ? `RETURNING ${supportRowId ? "rowid, " : ""}*` : "",
   ].join(" ");
 }
 
@@ -81,15 +82,16 @@ export function updateTable(
   table: string,
   value: Record<string, unknown>,
   where: Record<string, unknown>,
-  supportReturning: boolean
+  supportReturning: boolean,
+  supportRowId: boolean
 ): string {
   return [
     "UPDATE",
     `${dialect.escapeId(schema)}.${dialect.escapeId(table)}`,
     "SET",
     generateSet(dialect, value),
     generateWhere(dialect, where),
-    supportReturning ? "RETURNING *" : "",
+    supportReturning ? `RETURNING ${supportRowId ? "rowid, " : ""}*` : "",
   ]
     .filter(Boolean)
     .join(" ");

diff --git a/src/drivers/sqlite-base-driver.ts b/src/drivers/sqlite-base-driver.ts
@@ -31,6 +31,7 @@ export abstract class SqliteLikeBaseDriver extends CommonSQLImplement {
 
   getFlags(): DriverFlags {
     return {
+      supportRowId: true,
       supportBigInt: false,
       supportModifyColumn: false,
       supportInsertReturning: true,
@@ -193,13 +194,15 @@ export abstract class SqliteLikeBaseDriver extends CommonSQLImplement {
       try {
         const rows = result.rows as Array<{ type: string; sql: string }>;
         const def = rows.find((row) => row.type === "table");
+
         if (def) {
           const createScript = def.sql;
 
           return {
             ...parseCreateTableScript(schemaName, createScript),
             createScript,
             schemaName,
+            type: "table",
           };
         }
 
@@ -228,7 +231,6 @@ export abstract class SqliteLikeBaseDriver extends CommonSQLImplement {
       .join(", ");
 
     // If there is rowid, it is likely, we need to query that row back
-    console.log("sss", key);
     const hasRowId = !!key["rowid"];
 
     const sql = `SELECT ${hasRowId ? "rowid, " : ""}* FROM ${this.escapeId(schemaName)}.${this.escapeId(tableName)} ${wherePart ? "WHERE " + wherePart : ""} LIMIT 1 OFFSET 0`;
@@ -248,7 +250,8 @@ export abstract class SqliteLikeBaseDriver extends CommonSQLImplement {
     if (
       schema.pk.length === 0 &&
       !schema.withoutRowId &&
-      !schema.columns.find((c) => c.name === "rowid")
+      !schema.columns.find((c) => c.name === "rowid") &&
+      schema.type === "table"
     ) {
       // Inject the rowid column
       injectRowIdColumn = true;