Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
MKCLOS
Core Development Platform
corepkgv2
Commits
5a8cf2f0
Commit
5a8cf2f0
authored
6 years ago
by
Ajit Jagtap
Browse files
Options
Downloads
Plain Diff
Merge branch 'Rahuls_Fixes' into 'devbranch'
Fixes See merge request
!2
parents
6cfe1997
c690a401
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!23
Devbranch to Master
,
!2
Fixes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dalmdl/dao/dao.go
+3
-0
dalmdl/dao/dao.go
utiliymdl/guidmdl/guidmdl.go
+1
-0
utiliymdl/guidmdl/guidmdl.go
with
4 additions
and
0 deletions
dalmdl/dao/dao.go
+
3
−
0
View file @
5a8cf2f0
...
...
@@ -10,6 +10,7 @@ import (
)
// BaseDAO help to fetch data
//TODO: Add coreerror object
type
BaseDAO
struct
{
filePath
string
query
[]
string
...
...
@@ -28,9 +29,11 @@ func GetDAO() *DAOBuilder {
}
// Run : Execute Query
//TODO: Before Run() call validate method
func
(
db
*
DAOBuilder
)
Run
()
*
gjson
.
Result
{
db
.
Output
=
gjson
.
Result
{}
for
_
,
qry
:=
range
db
.
query
{
// FIXME:Return error. Error handling remaining.
db
.
Output
,
_
=
fdb
.
GetDataDAO
(
db
.
filePath
,
qry
,
db
.
isCacheable
,
db
.
Output
)
}
...
...
This diff is collapsed.
Click to expand it.
utiliymdl/guidmdl/guidmdl.go
+
1
−
0
View file @
5a8cf2f0
...
...
@@ -6,5 +6,6 @@ import (
// GetGUID will give UUID
func
GetGUID
()
string
{
//TODO: Check GUID version
return
ksuid
.
New
()
.
String
()
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets