pqb 0.61.0 → 0.61.2

package/dist/index.js

@@ -401,7 +401,7 @@ RawSql.prototype.type = ExpressionTypeMethod.prototype.type;
 const rawSqlToCode = (rawSql, t) => {
   const { _sql: sql, _values: values } = rawSql;
   let code = `${t}.sql`;
-  code += typeof sql === "string" ? `({ raw: '${sql.replace(/'/g, "\\'")}' })` : templateLiteralSQLToCode(sql);
+  code += typeof sql === "string" ? values ? `({ raw: '${sql.replace(/'/g, "\\'")}' })` : `\`${sql.replace(/`/g, "\\`")}\`` : templateLiteralSQLToCode(sql);
   if (values) {
     code += `.values(${JSON.stringify(values)})`;
   }
@@ -501,7 +501,7 @@ const consumeColumnName = () => {
 const defaultNowFn = "now()";
 let currentNowFn = defaultNowFn;
 const setDefaultNowFn = (sql) => {
-  currentNowFn = `(${sql})`;
+  currentNowFn = sql;
 };
 const getDefaultNowFn = () => currentNowFn;
 const resetDefaultNowFn = () => {
@@ -1261,10 +1261,13 @@ const combineCodeElements = (input) => {
   return output;
 };
 const columnsShapeToCode = (ctx, shape) => {
-  const hasTimestamps = "createdAt" in shape && isDefaultTimeStamp(
-    shape.createdAt
-  ) && "updatedAt" in shape && isDefaultTimeStamp(
-    shape.updatedAt
+  const hasTimestamps = (
+    // migration should capture the current `nowSQL`, it can be changed later by user
+    !ctx.migration && "createdAt" in shape && isDefaultTimeStamp(
+      shape.createdAt
+    ) && "updatedAt" in shape && isDefaultTimeStamp(
+      shape.updatedAt
+    )
   );
   const code = [];
   for (const key in shape) {
@@ -1688,7 +1691,7 @@ const columnCode = (type, ctx, key, code) => {
   if (data.compression)
     addCode(code, `.compression(${singleQuote(data.compression)})`);
   if (data.collate) addCode(code, `.collate(${singleQuote(data.collate)})`);
-  if (data.modifyQuery)
+  if (data.modifyQuery && !ctx.migration)
     addCode(code, `.modifyQuery(${data.modifyQuery.toString()})`);
   return code.length === 1 && typeof code[0] === "string" ? code[0] : code;
 };
@@ -2151,7 +2154,7 @@ class DateTimeTzBaseClass extends DateTimeBaseClass {
 const timestampToCode = (self, ctx, key) => {
   const { dateTimePrecision: p } = self.data;
   const { defaultTimestamp } = self.data;
-  if (defaultTimestamp) {
+  if (!ctx.migration && defaultTimestamp) {
     const noTz = self instanceof TimestampColumn ? "NoTZ" : "";
     const def = self.data.default;
     const modifyQuery = self.data.modifyQuery;