Skip to content

Commit afe0ad5

Browse files
author
Lars-Erik Roald
committed
fix formatDate fallback
1 parent 355d6b8 commit afe0ad5

File tree

3 files changed

+33
-13
lines changed

3 files changed

+33
-13
lines changed

dist/index.browser.mjs

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4963,12 +4963,12 @@ function requireNewDecode$4 () {
49634963
return newDecode$4;
49644964
}
49654965

4966-
var formatOut_1;
4967-
var hasRequiredFormatOut;
4966+
var formatOut_1$1;
4967+
var hasRequiredFormatOut$1;
49684968

4969-
function requireFormatOut () {
4970-
if (hasRequiredFormatOut) return formatOut_1;
4971-
hasRequiredFormatOut = 1;
4969+
function requireFormatOut$1 () {
4970+
if (hasRequiredFormatOut$1) return formatOut_1$1;
4971+
hasRequiredFormatOut$1 = 1;
49724972
var getSessionSingleton = requireGetSessionSingleton();
49734973
const quote = requireQuote$2();
49744974

@@ -4982,8 +4982,8 @@ function requireFormatOut () {
49824982
return `${quote(context, column._dbName)}`;
49834983
}
49844984

4985-
formatOut_1 = formatOut;
4986-
return formatOut_1;
4985+
formatOut_1$1 = formatOut;
4986+
return formatOut_1$1;
49874987
}
49884988

49894989
var date;
@@ -4994,7 +4994,7 @@ function requireDate () {
49944994
hasRequiredDate = 1;
49954995
var newEncode = requireNewEncode$5();
49964996
var newDecode = requireNewDecode$4();
4997-
var formatOut = requireFormatOut();
4997+
var formatOut = requireFormatOut$1();
49984998
var purify = requirePurify$3();
49994999

50005000
function _new(column) {
@@ -5062,6 +5062,29 @@ function requireNewEncode$4 () {
50625062
return newEncode$4;
50635063
}
50645064

5065+
var formatOut_1;
5066+
var hasRequiredFormatOut;
5067+
5068+
function requireFormatOut () {
5069+
if (hasRequiredFormatOut) return formatOut_1;
5070+
hasRequiredFormatOut = 1;
5071+
var getSessionSingleton = requireGetSessionSingleton();
5072+
const quote = requireQuote$2();
5073+
5074+
function formatOut(context, column, alias) {
5075+
var formatColumn = getSessionSingleton(context, 'formatDateTzOut') || getSessionSingleton(context, 'formatDateOut');
5076+
if (formatColumn)
5077+
return formatColumn(column, alias);
5078+
else if (alias)
5079+
return `${alias}.${quote(context, column._dbName)}`;
5080+
else
5081+
return `${quote(context, column._dbName)}`;
5082+
}
5083+
5084+
formatOut_1 = formatOut;
5085+
return formatOut_1;
5086+
}
5087+
50655088
var dateWithTimeZone;
50665089
var hasRequiredDateWithTimeZone;
50675090

@@ -9669,7 +9692,6 @@ function requireWhere$1 () {
96699692
if (hasRequiredWhere$1) return where$1;
96709693
hasRequiredWhere$1 = 1;
96719694
const negotiateRawSqlFilter = requireNegotiateRawSqlFilter();
9672-
requireTryGetSessionContext();
96739695

96749696
function newWhere(_relations, _depth) {
96759697

dist/index.mjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5070,11 +5070,10 @@ function requireFormatOut () {
50705070
if (hasRequiredFormatOut) return formatOut_1;
50715071
hasRequiredFormatOut = 1;
50725072
var getSessionSingleton = requireGetSessionSingleton();
5073-
var formatDateOut = requireFormatOut$1();
50745073
const quote = requireQuote$6();
50755074

50765075
function formatOut(context, column, alias) {
5077-
var formatColumn = getSessionSingleton(context, 'formatDateTzOut') || formatDateOut;
5076+
var formatColumn = getSessionSingleton(context, 'formatDateTzOut') || getSessionSingleton(context, 'formatDateOut');
50785077
if (formatColumn)
50795078
return formatColumn(column, alias);
50805079
else if (alias)

src/table/column/dateWithTimeZone/formatOut.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
var getSessionSingleton = require('../../getSessionSingleton');
2-
var formatDateOut = require('../date/formatOut');
32
const quote = require('../../quote');
43

54
function formatOut(context, column, alias) {
6-
var formatColumn = getSessionSingleton(context, 'formatDateTzOut') || formatDateOut;
5+
var formatColumn = getSessionSingleton(context, 'formatDateTzOut') || getSessionSingleton(context, 'formatDateOut');
76
if (formatColumn)
87
return formatColumn(column, alias);
98
else if (alias)

0 commit comments

Comments
 (0)