Skip to content

Commit a43409d

Browse files
author
Chris Turner
authored
Merge pull request #291 from datajoint/stage-external-storage
External Stage -> External
2 parents 8848a02 + 9b7ceb4 commit a43409d

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

+dj/+internal/GeneralRelvar.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ function disp(self)
9999
fprintf ' ...\n\n'
100100
end
101101
end
102-
fprintf('%d tuples (%.3g s)\n\n', self.count, toc)
102+
if dj.config('displayCount')
103+
fprintf('%d tuples (%.3g s)\n\n', self.count, toc)
104+
end
103105
end
104106

105107
function view(self, varargin)
@@ -955,4 +957,4 @@ case isa(cond, 'dj.internal.GeneralRelvar')
955957
end
956958
end
957959
end
958-
end
960+
end

+dj/+internal/Settings.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
'displayLimit', 12, ... how many rows to display when previewing a relation
1616
'displayDiagram_hierarchy_radius', [2 1], ... levels up and down the hierachy to display in `erd schema.Table`
1717
'displayDiagram_font_size', 12, ... font size to use in ERD labels
18+
'displayCount', true, ... optionally display count of records in result
1819
'queryPopulate_check', true, ...
1920
'queryPopulate_ancestors', false, ...
2021
'queryBigint_to_double', false, ...
@@ -154,4 +155,4 @@ function envVarUpdate()
154155
envVarUpdate();
155156
end
156157
end
157-
end
158+
end

LNX-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
interval: 1s
3030
fakeservices.datajoint.io:
3131
<<: *net
32-
image: raphaelguzman/nginx:v0.0.8
32+
image: raphaelguzman/nginx:v0.0.10
3333
environment:
3434
- ADD_db_TYPE=DATABASE
3535
- ADD_db_ENDPOINT=db:3306

local-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434
interval: 1s
3535
fakeservices.datajoint.io:
3636
<<: *net
37-
image: raphaelguzman/nginx:v0.0.8
37+
image: raphaelguzman/nginx:v0.0.10
3838
environment:
3939
- ADD_db_TYPE=DATABASE
4040
- ADD_db_ENDPOINT=db:3306

0 commit comments

Comments
 (0)