rads-db 3.2.2 → 3.2.4

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { g as RadsConfig, T as TypeDefinition } from './types-9a0ba02b.js';
+import { g as RadsConfig, T as TypeDefinition } from './types-17bcd41b.js';
 import 'mssql';
 import '_rads-db';
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-9a0ba02b.js';
-export { O as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, ak as DeepKeys, af as DeepPartial, ad as DeepPartialWithNulls, ae as DeepPartialWithNullsItem, al as EntityMethods, w as EnumDefinition, v as FieldDefinition, J as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, H as GenerateClientNormalizedOptions, B as GenerateClientOptions, a9 as Get, $ as GetAggArgs, a0 as GetAggArgsAgg, a3 as GetAggArgsAny, a6 as GetAggResponse, _ as GetArgs, a2 as GetArgsAny, a5 as GetArgsInclude, Q as GetManyArgs, a1 as GetManyArgsAny, a7 as GetManyResponse, a8 as GetResponse, aa as GetResponseInclude, ab as GetResponseIncludeSelect, ac as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ah as InverseRelation, M as MinimalDriver, aj as Put, ai as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, N as RadsFeature, y as RadsHookDoc, L as RadsUiSlotDefinition, K as RadsUiSlotName, I as RadsVitePluginOptions, ag as Relation, i as RequiredFields, l as RestDriverOptions, A as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, z as SqlDriverOptions, T as TypeDefinition, j as ValidateStringDecoratorArgs, X as VerifyManyArgs, a4 as VerifyManyArgsAny, Y as VerifyManyResponse, Z as Where, W as WhereJsonContains } from './types-9a0ba02b.js';
+import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-17bcd41b.js';
+export { O as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, ak as DeepKeys, af as DeepPartial, ad as DeepPartialWithNulls, ae as DeepPartialWithNullsItem, al as EntityMethods, w as EnumDefinition, v as FieldDefinition, J as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, H as GenerateClientNormalizedOptions, B as GenerateClientOptions, a9 as Get, $ as GetAggArgs, a0 as GetAggArgsAgg, a3 as GetAggArgsAny, a6 as GetAggResponse, _ as GetArgs, a2 as GetArgsAny, a5 as GetArgsInclude, Q as GetManyArgs, a1 as GetManyArgsAny, a7 as GetManyResponse, a8 as GetResponse, aa as GetResponseInclude, ab as GetResponseIncludeSelect, ac as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ah as InverseRelation, M as MinimalDriver, aj as Put, ai as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, N as RadsFeature, y as RadsHookDoc, L as RadsUiSlotDefinition, K as RadsUiSlotName, I as RadsVitePluginOptions, ag as Relation, i as RequiredFields, l as RestDriverOptions, A as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, z as SqlDriverOptions, T as TypeDefinition, j as ValidateStringDecoratorArgs, X as VerifyManyArgs, a4 as VerifyManyArgsAny, Y as VerifyManyResponse, Z as Where, W as WhereJsonContains } from './types-17bcd41b.js';
 import { RadsDb } from '_rads-db';
 export { RadsDb } from '_rads-db';
 import 'mssql';

package/dist/{types-9a0ba02b.d.ts → types-17bcd41b.d.ts}

@@ -325,7 +325,10 @@ interface MinimalDriver {
     deleteAll?: (args: GetManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any>[]>;
     put?: (data: Record<string, any>, ctx?: RadsRequestContext) => MaybePromise<void>;
     verifyMany?: (args?: VerifyManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<VerifyManyResponse>;
-    generateMigrationScript?: () => MaybePromise<string | undefined>;
+    generateMigrationScript?: () => MaybePromise<{
+        createScript: string;
+        dropScript: string;
+    }>;
 }
 type Driver = Required<Omit<MinimalDriver, 'verifyMany' | 'client' | 'generateMigrationScript'>> & Pick<MinimalDriver, 'verifyMany' | 'client' | 'generateMigrationScript'>;
 interface FieldDefinition {

package/drivers/sql.cjs

@@ -314,10 +314,10 @@ var _default = options => {
         for (const p in parameters) {
           req.input(p, parameters[p]);
         }
-        console.log(query);
+        ctx?.log?.(query);
         const result2 = await req.query(query);
         const nodes = result2.recordset || [];
-        console.log(result2);
+        ctx?.log?.(result2);
         return nodes[0];
       },
       async putMany(items, ctx) {
@@ -366,6 +366,7 @@ var _default = options => {
                 console.error(`\u274C Failed insert into ${realTable} [${valuesChunk.length} rows]`);
                 console.error(`First 300 chars of query:
 ${insertQuery.slice(0, 300)}...`);
+                console.error(e);
                 throw e;
               }
             }
@@ -385,12 +386,17 @@ ${insertQuery.slice(0, 300)}...`);
           const entity2 = schema2[entityName];
           if (!entity2) throw new Error(`Entity "${entityName}" not found in schema`);
           const createTableRequest1 = getCreateTableRequestsFor(entityName, {
-            tableNamePrefix: options.tablePrefix
+            tableNamePrefix: options.tablePrefix,
+            dropIfExists: true
           });
           const createTableRequest2 = getCreateTableRequestsFor(entityName, {
-            tableNamePrefix: options.stagingTablePrefix
+            tableNamePrefix: options.stagingTablePrefix,
+            dropIfExists: true
           });
-          return [...createTableRequest1.createRequests, ...createTableRequest2.createRequests].join(";\n\n");
+          return {
+            dropScript: [...createTableRequest1.dropRequests, ...createTableRequest2.dropRequests].join(";\n\n"),
+            createScript: [...createTableRequest1.createRequests, ...createTableRequest2.createRequests].join(";\n\n")
+          };
         }
         function getCreateTableRequestsFor(entityName, options2) {
           const {
@@ -657,10 +663,10 @@ END;
       for (const p in parameters) {
         req.input(p, parameters[p]);
       }
-      console.log(query);
+      ctx?.log?.(query);
       const result2 = await req.query(query);
       const nodes = result2.recordset || [];
-      console.log(result2);
+      ctx?.log?.(result2);
       return {
         nodes,
         cursor: nodes.length === maxItemCount ? String((Number(args.cursor || "0") || 0) + nodes.length) : void 0

package/drivers/sql.mjs

@@ -183,10 +183,10 @@ export default (options) => {
         for (const p in parameters) {
           req.input(p, parameters[p]);
         }
-        console.log(query);
+        ctx?.log?.(query);
         const result2 = await req.query(query);
         const nodes = result2.recordset || [];
-        console.log(result2);
+        ctx?.log?.(result2);
         return nodes[0];
       },
       async putMany(items, ctx) {
@@ -237,6 +237,7 @@ export default (options) => {
                 console.error(`\u274C Failed insert into ${realTable} [${valuesChunk.length} rows]`);
                 console.error(`First 300 chars of query:
 ${insertQuery.slice(0, 300)}...`);
+                console.error(e);
                 throw e;
               }
             }
@@ -255,11 +256,18 @@ ${insertQuery.slice(0, 300)}...`);
         function buildMigrationScript(schema2, entityName) {
           const entity2 = schema2[entityName];
           if (!entity2) throw new Error(`Entity "${entityName}" not found in schema`);
-          const createTableRequest1 = getCreateTableRequestsFor(entityName, { tableNamePrefix: options.tablePrefix });
+          const createTableRequest1 = getCreateTableRequestsFor(entityName, {
+            tableNamePrefix: options.tablePrefix,
+            dropIfExists: true
+          });
           const createTableRequest2 = getCreateTableRequestsFor(entityName, {
-            tableNamePrefix: options.stagingTablePrefix
+            tableNamePrefix: options.stagingTablePrefix,
+            dropIfExists: true
           });
-          return [...createTableRequest1.createRequests, ...createTableRequest2.createRequests].join(";\n\n");
+          return {
+            dropScript: [...createTableRequest1.dropRequests, ...createTableRequest2.dropRequests].join(";\n\n"),
+            createScript: [...createTableRequest1.createRequests, ...createTableRequest2.createRequests].join(";\n\n")
+          };
         }
         function getCreateTableRequestsFor(entityName, options2) {
           const { tableNameSuffix, tableNamePrefix, dropIfExists, addPrimaryKey, addForeignKeys, foreignKeysTables } = options2 || {};
@@ -531,10 +539,10 @@ END;
       for (const p in parameters) {
         req.input(p, parameters[p]);
       }
-      console.log(query);
+      ctx?.log?.(query);
       const result2 = await req.query(query);
       const nodes = result2.recordset || [];
-      console.log(result2);
+      ctx?.log?.(result2);
       return {
         nodes,
         cursor: nodes.length === maxItemCount ? String((Number(args.cursor || "0") || 0) + nodes.length) : void 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",
   "license": "ISC",