sqlite3 2.1.1-aarch64-linux-musl → 2.2.0-aarch64-linux-musl
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -0
- data/ext/sqlite3/exception.c +71 -66
- data/ext/sqlite3/exception.h +2 -0
- data/ext/sqlite3/extconf.rb +6 -3
- data/ext/sqlite3/statement.c +1 -1
- data/lib/sqlite3/3.1/sqlite3_native.so +0 -0
- data/lib/sqlite3/3.2/sqlite3_native.so +0 -0
- data/lib/sqlite3/3.3/sqlite3_native.so +0 -0
- data/lib/sqlite3/errors.rb +28 -0
- data/lib/sqlite3/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ea7686eb27b6fb919bac4928a6b05d61b05ea8c31a91113dbbd049ca33668404
|
4
|
+
data.tar.gz: 88595080229104242358722f90c48417bb235515b86ae84ab8f97568791e2cf0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e5643ee716fd3cacf8c71802a2045d97f651858f76bd34e6e707c3b6630c8afe3a943c9af84c517ae6dcfd13221d43c0e36d9ee035f21e0fd254ed05301e68fa
|
7
|
+
data.tar.gz: 34271016c91c0395868ae246e25882af90a1dabd0cc46ddf89ab24a538d3efabaf5ffb08fb6a3e653cf54f72dda73a531bfc18de85b6ae8a3d7b6ad77cb5513f
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,17 @@
|
|
1
1
|
# sqlite3-ruby Changelog
|
2
2
|
|
3
|
+
## 2.2.0 / 2024-10-30
|
4
|
+
|
5
|
+
### Added
|
6
|
+
|
7
|
+
- URI filenames are now allowed. This allows the injection of some behavior via recognized query parameters. See https://www.sqlite.org/uri.html for more information. [#571] @flavorjones
|
8
|
+
|
9
|
+
|
10
|
+
### Improved
|
11
|
+
|
12
|
+
- SQL Syntax errors during `Database#prepare` will raise a verbose exception with a multiline message indicating with a "^" exactly where in the statement the error occurred. [#554] @fractaledmind @flavorjones
|
13
|
+
|
14
|
+
|
3
15
|
## 2.1.1 / 2024-10-22
|
4
16
|
|
5
17
|
### Dependencies
|
data/ext/sqlite3/exception.c
CHANGED
@@ -1,101 +1,82 @@
|
|
1
1
|
#include <sqlite3_ruby.h>
|
2
2
|
|
3
|
-
|
4
|
-
|
3
|
+
static VALUE
|
4
|
+
status2klass(int status)
|
5
5
|
{
|
6
|
-
VALUE klass = Qnil;
|
7
|
-
|
8
6
|
/* Consider only lower 8 bits, to work correctly when
|
9
7
|
extended result codes are enabled. */
|
10
8
|
switch (status & 0xff) {
|
11
9
|
case SQLITE_OK:
|
12
|
-
return;
|
13
|
-
break;
|
10
|
+
return Qnil;
|
14
11
|
case SQLITE_ERROR:
|
15
|
-
|
16
|
-
break;
|
12
|
+
return rb_path2class("SQLite3::SQLException");
|
17
13
|
case SQLITE_INTERNAL:
|
18
|
-
|
19
|
-
break;
|
14
|
+
return rb_path2class("SQLite3::InternalException");
|
20
15
|
case SQLITE_PERM:
|
21
|
-
|
22
|
-
break;
|
16
|
+
return rb_path2class("SQLite3::PermissionException");
|
23
17
|
case SQLITE_ABORT:
|
24
|
-
|
25
|
-
break;
|
18
|
+
return rb_path2class("SQLite3::AbortException");
|
26
19
|
case SQLITE_BUSY:
|
27
|
-
|
28
|
-
break;
|
20
|
+
return rb_path2class("SQLite3::BusyException");
|
29
21
|
case SQLITE_LOCKED:
|
30
|
-
|
31
|
-
break;
|
22
|
+
return rb_path2class("SQLite3::LockedException");
|
32
23
|
case SQLITE_NOMEM:
|
33
|
-
|
34
|
-
break;
|
24
|
+
return rb_path2class("SQLite3::MemoryException");
|
35
25
|
case SQLITE_READONLY:
|
36
|
-
|
37
|
-
break;
|
26
|
+
return rb_path2class("SQLite3::ReadOnlyException");
|
38
27
|
case SQLITE_INTERRUPT:
|
39
|
-
|
40
|
-
break;
|
28
|
+
return rb_path2class("SQLite3::InterruptException");
|
41
29
|
case SQLITE_IOERR:
|
42
|
-
|
43
|
-
break;
|
30
|
+
return rb_path2class("SQLite3::IOException");
|
44
31
|
case SQLITE_CORRUPT:
|
45
|
-
|
46
|
-
break;
|
32
|
+
return rb_path2class("SQLite3::CorruptException");
|
47
33
|
case SQLITE_NOTFOUND:
|
48
|
-
|
49
|
-
break;
|
34
|
+
return rb_path2class("SQLite3::NotFoundException");
|
50
35
|
case SQLITE_FULL:
|
51
|
-
|
52
|
-
break;
|
36
|
+
return rb_path2class("SQLite3::FullException");
|
53
37
|
case SQLITE_CANTOPEN:
|
54
|
-
|
55
|
-
break;
|
38
|
+
return rb_path2class("SQLite3::CantOpenException");
|
56
39
|
case SQLITE_PROTOCOL:
|
57
|
-
|
58
|
-
break;
|
40
|
+
return rb_path2class("SQLite3::ProtocolException");
|
59
41
|
case SQLITE_EMPTY:
|
60
|
-
|
61
|
-
break;
|
42
|
+
return rb_path2class("SQLite3::EmptyException");
|
62
43
|
case SQLITE_SCHEMA:
|
63
|
-
|
64
|
-
break;
|
44
|
+
return rb_path2class("SQLite3::SchemaChangedException");
|
65
45
|
case SQLITE_TOOBIG:
|
66
|
-
|
67
|
-
break;
|
46
|
+
return rb_path2class("SQLite3::TooBigException");
|
68
47
|
case SQLITE_CONSTRAINT:
|
69
|
-
|
70
|
-
break;
|
48
|
+
return rb_path2class("SQLite3::ConstraintException");
|
71
49
|
case SQLITE_MISMATCH:
|
72
|
-
|
73
|
-
break;
|
50
|
+
return rb_path2class("SQLite3::MismatchException");
|
74
51
|
case SQLITE_MISUSE:
|
75
|
-
|
76
|
-
break;
|
52
|
+
return rb_path2class("SQLite3::MisuseException");
|
77
53
|
case SQLITE_NOLFS:
|
78
|
-
|
79
|
-
break;
|
54
|
+
return rb_path2class("SQLite3::UnsupportedException");
|
80
55
|
case SQLITE_AUTH:
|
81
|
-
|
82
|
-
break;
|
56
|
+
return rb_path2class("SQLite3::AuthorizationException");
|
83
57
|
case SQLITE_FORMAT:
|
84
|
-
|
85
|
-
break;
|
58
|
+
return rb_path2class("SQLite3::FormatException");
|
86
59
|
case SQLITE_RANGE:
|
87
|
-
|
88
|
-
break;
|
60
|
+
return rb_path2class("SQLite3::RangeException");
|
89
61
|
case SQLITE_NOTADB:
|
90
|
-
|
91
|
-
break;
|
62
|
+
return rb_path2class("SQLite3::NotADatabaseException");
|
92
63
|
default:
|
93
|
-
|
64
|
+
return rb_path2class("SQLite3::Exception");
|
65
|
+
}
|
66
|
+
}
|
67
|
+
|
68
|
+
void
|
69
|
+
rb_sqlite3_raise(sqlite3 *db, int status)
|
70
|
+
{
|
71
|
+
VALUE klass = status2klass(status);
|
72
|
+
if (NIL_P(klass)) {
|
73
|
+
return;
|
94
74
|
}
|
95
75
|
|
96
|
-
|
97
|
-
rb_iv_set(
|
98
|
-
|
76
|
+
VALUE exception = rb_exc_new2(klass, sqlite3_errmsg(db));
|
77
|
+
rb_iv_set(exception, "@code", INT2FIX(status));
|
78
|
+
|
79
|
+
rb_exc_raise(exception);
|
99
80
|
}
|
100
81
|
|
101
82
|
/*
|
@@ -104,14 +85,38 @@ rb_sqlite3_raise(sqlite3 *db, int status)
|
|
104
85
|
void
|
105
86
|
rb_sqlite3_raise_msg(sqlite3 *db, int status, const char *msg)
|
106
87
|
{
|
107
|
-
VALUE
|
108
|
-
|
109
|
-
if (status == SQLITE_OK) {
|
88
|
+
VALUE klass = status2klass(status);
|
89
|
+
if (NIL_P(klass)) {
|
110
90
|
return;
|
111
91
|
}
|
112
92
|
|
113
|
-
exception = rb_exc_new2(
|
93
|
+
VALUE exception = rb_exc_new2(klass, msg);
|
94
|
+
rb_iv_set(exception, "@code", INT2FIX(status));
|
114
95
|
sqlite3_free((void *)msg);
|
96
|
+
|
97
|
+
rb_exc_raise(exception);
|
98
|
+
}
|
99
|
+
|
100
|
+
void
|
101
|
+
rb_sqlite3_raise_with_sql(sqlite3 *db, int status, const char *sql)
|
102
|
+
{
|
103
|
+
VALUE klass = status2klass(status);
|
104
|
+
if (NIL_P(klass)) {
|
105
|
+
return;
|
106
|
+
}
|
107
|
+
|
108
|
+
const char *error_msg = sqlite3_errmsg(db);
|
109
|
+
int error_offset = -1;
|
110
|
+
#ifdef HAVE_SQLITE3_ERROR_OFFSET
|
111
|
+
error_offset = sqlite3_error_offset(db);
|
112
|
+
#endif
|
113
|
+
|
114
|
+
VALUE exception = rb_exc_new2(klass, error_msg);
|
115
115
|
rb_iv_set(exception, "@code", INT2FIX(status));
|
116
|
+
if (sql) {
|
117
|
+
rb_iv_set(exception, "@sql", rb_str_new2(sql));
|
118
|
+
rb_iv_set(exception, "@sql_offset", INT2FIX(error_offset));
|
119
|
+
}
|
120
|
+
|
116
121
|
rb_exc_raise(exception);
|
117
122
|
}
|
data/ext/sqlite3/exception.h
CHANGED
@@ -3,8 +3,10 @@
|
|
3
3
|
|
4
4
|
#define CHECK(_db, _status) rb_sqlite3_raise(_db, _status);
|
5
5
|
#define CHECK_MSG(_db, _status, _msg) rb_sqlite3_raise_msg(_db, _status, _msg);
|
6
|
+
#define CHECK_PREPARE(_db, _status, _sql) rb_sqlite3_raise_with_sql(_db, _status, _sql)
|
6
7
|
|
7
8
|
void rb_sqlite3_raise(sqlite3 *db, int status);
|
8
9
|
void rb_sqlite3_raise_msg(sqlite3 *db, int status, const char *msg);
|
10
|
+
void rb_sqlite3_raise_with_sql(sqlite3 *db, int status, const char *sql);
|
9
11
|
|
10
12
|
#endif
|
data/ext/sqlite3/extconf.rb
CHANGED
@@ -50,8 +50,9 @@ module Sqlite3
|
|
50
50
|
def configure_packaged_libraries
|
51
51
|
minimal_recipe.tap do |recipe|
|
52
52
|
recipe.configure_options += [
|
53
|
-
"--
|
54
|
-
"--enable-static
|
53
|
+
"--disable-shared",
|
54
|
+
"--enable-static",
|
55
|
+
"--disable-tcl",
|
55
56
|
"--enable-fts5"
|
56
57
|
]
|
57
58
|
ENV.to_h.tap do |env|
|
@@ -60,7 +61,8 @@ module Sqlite3
|
|
60
61
|
"-fPIC", # needed for linking the static library into a shared library
|
61
62
|
"-O2", # see https://github.com/sparklemotion/sqlite3-ruby/issues/335 for some benchmarks
|
62
63
|
"-fvisibility=hidden", # see https://github.com/rake-compiler/rake-compiler-dock/issues/87
|
63
|
-
"-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1"
|
64
|
+
"-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1",
|
65
|
+
"-DSQLITE_USE_URI=1"
|
64
66
|
]
|
65
67
|
env["CFLAGS"] = [user_cflags, env["CFLAGS"], more_cflags].flatten.join(" ")
|
66
68
|
recipe.configure_options += env.select { |k, v| ENV_ALLOWLIST.include?(k) }
|
@@ -132,6 +134,7 @@ module Sqlite3
|
|
132
134
|
|
133
135
|
have_func("sqlite3_prepare_v2")
|
134
136
|
have_func("sqlite3_db_name", "sqlite3.h") # v3.39.0
|
137
|
+
have_func("sqlite3_error_offset", "sqlite3.h") # v3.38.0
|
135
138
|
|
136
139
|
have_type("sqlite3_int64", "sqlite3.h")
|
137
140
|
have_type("sqlite3_uint64", "sqlite3.h")
|
data/ext/sqlite3/statement.c
CHANGED
Binary file
|
Binary file
|
Binary file
|
data/lib/sqlite3/errors.rb
CHANGED
@@ -4,6 +4,34 @@ module SQLite3
|
|
4
4
|
class Exception < ::StandardError
|
5
5
|
# A convenience for accessing the error code for this exception.
|
6
6
|
attr_reader :code
|
7
|
+
|
8
|
+
# If the error is associated with a SQL query, this is the query
|
9
|
+
attr_reader :sql
|
10
|
+
|
11
|
+
# If the error is associated with a particular offset in a SQL query, this is the non-negative
|
12
|
+
# offset. If the offset is not available, this will be -1.
|
13
|
+
attr_reader :sql_offset
|
14
|
+
|
15
|
+
def message
|
16
|
+
[super, sql_error].compact.join(":\n")
|
17
|
+
end
|
18
|
+
|
19
|
+
private def sql_error
|
20
|
+
return nil unless @sql
|
21
|
+
return @sql.chomp unless @sql_offset >= 0
|
22
|
+
|
23
|
+
offset = @sql_offset
|
24
|
+
sql.lines.flat_map do |line|
|
25
|
+
if offset >= 0 && line.length > offset
|
26
|
+
blanks = " " * offset
|
27
|
+
offset = -1
|
28
|
+
[line.chomp, blanks + "^"]
|
29
|
+
else
|
30
|
+
offset -= line.length if offset
|
31
|
+
line.chomp
|
32
|
+
end
|
33
|
+
end.join("\n")
|
34
|
+
end
|
7
35
|
end
|
8
36
|
|
9
37
|
class SQLException < Exception; end
|
data/lib/sqlite3/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sqlite3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.2.0
|
5
5
|
platform: aarch64-linux-musl
|
6
6
|
authors:
|
7
7
|
- Jamis Buck
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2024-10-
|
14
|
+
date: 2024-10-30 00:00:00.000000000 Z
|
15
15
|
dependencies: []
|
16
16
|
description: |
|
17
17
|
Ruby library to interface with the SQLite3 database engine (http://www.sqlite.org). Precompiled
|