good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
U
upper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
open
upper
Commits
c77c62e8
Commit
c77c62e8
authored
8 years ago
by
José Carlos Nieto
Browse files
Options
Downloads
Patches
Plain Diff
Move Tx logic to sqladapter.
parent
6f9a2619
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
internal/sqladapter/tx.go
+13
-0
13 additions, 0 deletions
internal/sqladapter/tx.go
postgresql/database.go
+5
-15
5 additions, 15 deletions
postgresql/database.go
with
18 additions
and
15 deletions
internal/sqladapter/tx.go
+
13
−
0
View file @
c77c62e8
...
@@ -94,6 +94,19 @@ func (t *txWrapper) Rollback() error {
...
@@ -94,6 +94,19 @@ func (t *txWrapper) Rollback() error {
return
t
.
BaseTx
.
Rollback
()
return
t
.
BaseTx
.
Rollback
()
}
}
func
RunTx
(
d
db
.
SQLDatabase
,
fn
func
(
tx
db
.
SQLTx
)
error
)
error
{
tx
,
err
:=
d
.
NewTx
()
if
err
!=
nil
{
return
err
}
defer
tx
.
Close
()
if
err
:=
fn
(
tx
);
err
!=
nil
{
tx
.
Rollback
()
return
err
}
return
tx
.
Commit
()
}
var
(
var
(
_
=
BaseTx
(
&
sqlTx
{})
_
=
BaseTx
(
&
sqlTx
{})
)
)
This diff is collapsed.
Click to expand it.
postgresql/database.go
+
5
−
15
View file @
c77c62e8
...
@@ -38,9 +38,8 @@ type database struct {
...
@@ -38,9 +38,8 @@ type database struct {
sqladapter
.
BaseDatabase
// Leveraged by sqladapter
sqladapter
.
BaseDatabase
// Leveraged by sqladapter
db
.
SQLBuilder
db
.
SQLBuilder
txMu
sync
.
Mutex
connURL
db
.
ConnectionURL
connURL
db
.
ConnectionURL
txMu
sync
.
Mutex
}
}
var
(
var
(
...
@@ -55,7 +54,7 @@ func newDatabase(settings db.ConnectionURL) (*database, error) {
...
@@ -55,7 +54,7 @@ func newDatabase(settings db.ConnectionURL) (*database, error) {
return
d
,
nil
return
d
,
nil
}
}
// Open stablishes a new connection
to a
SQL server.
// Open stablishes a new connection
with the
SQL server.
func
Open
(
settings
db
.
ConnectionURL
)
(
db
.
SQLDatabase
,
error
)
{
func
Open
(
settings
db
.
ConnectionURL
)
(
db
.
SQLDatabase
,
error
)
{
d
,
err
:=
newDatabase
(
settings
)
d
,
err
:=
newDatabase
(
settings
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -219,19 +218,10 @@ func (d *database) NewLocalCollection(name string) db.Collection {
...
@@ -219,19 +218,10 @@ func (d *database) NewLocalCollection(name string) db.Collection {
return
newTable
(
d
,
name
)
return
newTable
(
d
,
name
)
}
}
// T
ransaction
creates a transaction and passes it to the given function, if
// T
x
creates a transaction and passes it to the given function, if
if the
//
if the
function returns no error then the transaction is commited.
// function returns no error then the transaction is commited.
func
(
d
*
database
)
Tx
(
fn
func
(
tx
db
.
SQLTx
)
error
)
error
{
func
(
d
*
database
)
Tx
(
fn
func
(
tx
db
.
SQLTx
)
error
)
error
{
tx
,
err
:=
d
.
NewTx
()
return
sqladapter
.
RunTx
(
d
,
fn
)
if
err
!=
nil
{
return
err
}
defer
tx
.
Close
()
if
err
:=
fn
(
tx
);
err
!=
nil
{
tx
.
Rollback
()
return
err
}
return
tx
.
Commit
()
}
}
// NewLocalTransaction allows sqladapter start a transaction block.
// NewLocalTransaction allows sqladapter start a transaction block.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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