Commit b73fae5
committed
Merge branch '1-3-stable'
* 1-3-stable: (25 commits)
Backport: Add installation command for Debian/Ubuntu
Doc: update repository links
Backport: Correct gem license
Update Manifest for new files
Prepare for release
Backport: Update Travis-CI information
Update ChangeLog with backports
Backport: Removed unused pointer
Update ChangeLog with merge backports
Backport: convert from test/unit to minitest
Backport gem cross-compilation changes
Backport: Reset before CHECKing the status
Adjust CHANGELOG with merge commits
Backport: Add MIT license reference to gemspec.
Improve test for #65 to prove that the blob is passed into the function correctly
Add test for calling function with blob argument (#65). Also, improve testing of blob storage in general, utilizing Blob type to correct column affinity.
Resolve bug #65. Correctly convert blob values to ruby
Now prepare for release
Use newer rake-compiler
Unset environment variables during cross compilation
...
Conflicts:
CHANGELOG.rdoc
lib/sqlite3/version.rb
test/test_statement.rb3 files changed
+21
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
8 | 25 | | |
9 | 26 | | |
10 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| 49 | + | |
48 | 50 | | |
49 | 51 | | |
50 | 52 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
0 commit comments