Skip to content

Keep up with upstream #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 71 commits into from
Feb 18, 2019
Merged

Keep up with upstream #2

merged 71 commits into from
Feb 18, 2019

Conversation

auxten
Copy link

@auxten auxten commented Nov 21, 2018

No description provided.

jung-kurt and others added 30 commits August 12, 2018 08:34
@jung-kurt
Update README: URL-encode connection options
0109106 
This change could save users from having to dig into source code to see how connection options are parsed.
implementation of set_authorizer interface
e30f9ff
clearer const formatting
df0c034 
with comments what const are used for what
@otoolep
Fix data race in AutoCommit()
abfacf5 
Detected via https://circleci.com/gh/rqlite/rqlite/2223.
@mattn
Merge pull request #623 from graf0/feature/#619
0eec847 
implementation of set_authorizer interface
@mattn
Fix build
c37ebbc 
Related on #623
@mattn
icu4c 62.1 already installed
c71eddf
@mattn
Merge pull request #631 from mattn/fix-build
1a378fb 
Fix build
@israel-lugo
Mention correct algorithm in function docs.
3598735 
CryptEncoder SHA384 and SHA512 variants (with and without salt) were incorrectly documented as using SHA256.
@mattn
Merge pull request #633 from israel-lugo/patch-1
593fde6 
Mention correct algorithm in function docs.
@mattn
Upgrade to SQLite 3.25.0
554bc0f 
Fixes #634, #635
@mattn
Merge pull request #636 from mattn/fix-635
89b0dfe 
Upgrade to SQLite 3.25.0
@mattn
Fix build
eadad87
@mattn
Merge pull request #637 from mattn/fix-build2
6de94b0 
Fix build
@akalin
Actually check the value of RunTests
25a6a28
@akalin
Add failing test
568d682
@akalin
Clean up test
d61fdcd
@akalin
Fix bug
ab4f174
@akalin
Use GoBytes
2364b28
@akalin
Add fatal message
3955886
@mattn
Merge pull request #641 from akalin/fix-test-call
e85a279 
Actually check the value of RunTests
@mattn
upgrade amalgamation code
9cb060a
@mattn
Merge pull request #645 from mattn/sqlite-amalgamation-3250200
0a88db3 
upgrade amalgamation code
@emirb
Add Go 1.11 to Travis build matrix
3b73f93
@relud
Fix typo in README.md
0ad2549
@mattn
Merge pull request #650 from relud/patch-1
5cd1ba5 
Fix typo in README.md
@rutsky
Remove extra backtick and fix Markdown formatting
2bf2b22
@mattn
Merge pull request #648 from emirb/patch-1
a98b6a4 
Add Go 1.11 to Travis build matrix
@mattn
Merge pull request #652 from rutsky/patch-1
3e1d67a 
Remove extra backtick and fix Markdown formatting
@mattn
Merge pull request #616 from jung-kurt/patch-1
c67b489 
Update README: URL-encode connection options
mattn and others added 24 commits November 22, 2018 01:46
@mattn
Merge pull request #665 from mjtrangoni/fix-gometalinter-issues
0a64ab2 
Fix gometalinter issues
@mattn
Merge pull request #644 from akalin/fix-pointer-conversion
c880439 
Clean up blob to byte slice conversion
@mattn
Merge pull request #643 from akalin/zero-length-blob
873ec57 
Distinguish between NULL and zero-length blobs on query
@mattn
Merge pull request #626 from otoolep/fix_data_race
6a9185d 
Fix data race in AutoCommit()
@mattn
Close db even if sqlite3_open_v2 return non-zero.
8f4ea28
@mattn
Merge pull request #670 from mattn/close-db
e924752 
Close db even if sqlite3_open_v2 return non-zero.
@mattn
SQLITE_OPEN_CREATE should be specified for sqlite3_open_v2 if mode is…
03b96a5 
… not rw

Fixes #667
Fixes #669
@mattn
Merge pull request #671 from mattn/fix667
248a1e6 
SQLITE_OPEN_CREATE should be specified for sqlite3_open_v2 if mode is…
@rittneje
Revert "SQLITE_OPEN_CREATE should be specified for sqlite3_open_v2 if…
2915940 
… mode is not rw"

This reverts commit 03b96a5.
@rittneje
adding unit test
5846e1a
@rittneje
fixed typo
2fe51da
@mattn
Merge pull request #673 from rittneje/revert-671
03cb0c0 
Revert 671
@mattn
upgrade amalgamation code
aa13f26
@mattn
Merge pull request #675 from mattn/sqlite-amalgamation-3260000
87ac1cb 
upgrade amalgamation code
@pocke
Fix typo in README
1688b64 
s/an/a/
@mattn
Merge pull request #679 from pocke/an-a
3fa1c55 
Fix typo in README
@dimroc @mattn
column types text, varchar, *char return as strings:
abc8991 
As opposed to []byte arrays. This brings sqlite closer
in line with other dbs like postgres, allowing downstream
consumers to assume the scanned value is string across underlying
dbs.
@dimroc @mattn
column_type SQLITE_TEXT returned as string by default
ae5cbb2
@mattn
Add test
5e7aedf
@mattn
Print type of result
4731d0e
@egonelbre
Faster travis running
01e5d0e
@egonelbre
Remove separate go build
54fcf30
@mattn
Merge pull request #692 from mattn/fix-688
58039ab 
Fix 688
@mattn
Merge pull request #693 from egonelbre/unify-travis-runs
4cb3725 
Unify travis runs
@radutopala
Copy link

@auxten I see these issues

# github.com/mattn/go-sqlite3
sqlite3-binding.c:222430:42: error: too few arguments to function call, expected 3, have 2
sqlite3-binding.c:66273:1: note: 'sqlite3BtreeBeginTrans' declared here
sqlite3-binding.c:24:25: note: expanded from macro 'SQLITE_PRIVATE'
sqlite3-binding.c:222431:43: error: too few arguments to function call, expected 3, have 2
sqlite3-binding.c:66273:1: note: 'sqlite3BtreeBeginTrans' declared here
sqlite3-binding.c:24:25: note: expanded from macro 'SQLITE_PRIVATE'
sqlite3-binding.c:223249:46: error: too few arguments to function call, expected 3, have 2
sqlite3-binding.c:66273:1: note: 'sqlite3BtreeBeginTrans' declared here
sqlite3-binding.c:24:25: note: expanded from macro 'SQLITE_PRIVATE'

on fresh update from mattn.

Do you plan on updating the fork soon? Thanks.

Btw, develop works fantastic 😄

@auxten auxten changed the base branch from develop to keep-up February 18, 2019 07:34
@auxten auxten merged commit 8e25596 into CovenantSQL:keep-up Feb 18, 2019
@auxten
Copy link
Author

auxten commented Feb 18, 2019 •
edited
Loading

@auxten I see these issues

# github.com/mattn/go-sqlite3
sqlite3-binding.c:222430:42: error: too few arguments to function call, expected 3, have 2
sqlite3-binding.c:66273:1: note: 'sqlite3BtreeBeginTrans' declared here
sqlite3-binding.c:24:25: note: expanded from macro 'SQLITE_PRIVATE'
sqlite3-binding.c:222431:43: error: too few arguments to function call, expected 3, have 2
sqlite3-binding.c:66273:1: note: 'sqlite3BtreeBeginTrans' declared here
sqlite3-binding.c:24:25: note: expanded from macro 'SQLITE_PRIVATE'
sqlite3-binding.c:223249:46: error: too few arguments to function call, expected 3, have 2
sqlite3-binding.c:66273:1: note: 'sqlite3BtreeBeginTrans' declared here
sqlite3-binding.c:24:25: note: expanded from macro 'SQLITE_PRIVATE'

on fresh update from mattn.

Do you plan on updating the fork soon? Thanks.

Btw, develop works fantastic 😄

hey, thanks for using it 😄
We are busy working on CovenantSQL now. For compatibility, we did not keep up with upstream. I merged @mattn 's upstream to branch keep-up, but have NOT done enough test. you can try it out. For any issue, glad to help.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xq262144 xq262144 Awaiting requested review from xq262144

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.