Skip to content

Commit 0e7b1a3

Browse files
committed
1 parent 3de99fb commit 0e7b1a3

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

error.zig renamed to errors.zig

File renamed without changes.

sqlite.zig

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ pub const c = @cImport({
99
@cInclude("sqlite3.h");
1010
});
1111

12-
usingnamespace @import("query.zig");
13-
usingnamespace @import("error.zig");
12+
const Text = @import("query.zig").Text;
13+
const ParsedQuery = @import("query.zig").ParsedQuery;
14+
15+
const errors = @import("errors.zig");
16+
const Error = errors.Error;
1417

1518
const logger = std.log.scoped(.sqlite);
1619

@@ -72,11 +75,11 @@ pub const Blob = struct {
7275
pub fn close(self: *Self) !void {
7376
const result = c.sqlite3_blob_close(self.handle);
7477
if (result != c.SQLITE_OK) {
75-
return errorFromResultCode(result);
78+
return errors.errorFromResultCode(result);
7679
}
7780
}
7881

79-
pub const Reader = io.Reader(*Self, Error, read);
82+
pub const Reader = io.Reader(*Self, errors.Error, read);
8083

8184
/// reader returns a io.Reader.
8285
pub fn reader(self: *Self) Reader {
@@ -100,7 +103,7 @@ pub const Blob = struct {
100103
self.offset,
101104
);
102105
if (result != c.SQLITE_OK) {
103-
return errorFromResultCode(result);
106+
return errors.errorFromResultCode(result);
104107
}
105108

106109
self.offset += @intCast(c_int, tmp_buffer.len);
@@ -123,7 +126,7 @@ pub const Blob = struct {
123126
self.offset,
124127
);
125128
if (result != c.SQLITE_OK) {
126-
return errorFromResultCode(result);
129+
return errors.errorFromResultCode(result);
127130
}
128131

129132
self.offset += @intCast(c_int, data.len);
@@ -352,7 +355,7 @@ pub const Db = struct {
352355
} else {
353356
diags.err = getDetailedErrorFromResultCode(result);
354357
}
355-
return errorFromResultCode(result);
358+
return errors.errorFromResultCode(result);
356359
}
357360

358361
return Self{ .db = db.? };
@@ -370,7 +373,7 @@ pub const Db = struct {
370373
} else {
371374
diags.err = getDetailedErrorFromResultCode(result);
372375
}
373-
return errorFromResultCode(result);
376+
return errors.errorFromResultCode(result);
374377
}
375378

376379
return Self{ .db = db.? };
@@ -579,7 +582,7 @@ pub fn Iterator(comptime Type: type) type {
579582
}
580583
if (result != c.SQLITE_ROW) {
581584
diags.err = getLastDetailedErrorFromDb(self.db);
582-
return errorFromResultCode(result);
585+
return errors.errorFromResultCode(result);
583586
}
584587

585588
const columns = c.sqlite3_column_count(self.stmt);
@@ -637,7 +640,7 @@ pub fn Iterator(comptime Type: type) type {
637640
}
638641
if (result != c.SQLITE_ROW) {
639642
diags.err = getLastDetailedErrorFromDb(self.db);
640-
return errorFromResultCode(result);
643+
return errors.errorFromResultCode(result);
641644
}
642645

643646
const columns = c.sqlite3_column_count(self.stmt);
@@ -1022,7 +1025,7 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
10221025
);
10231026
if (result != c.SQLITE_OK) {
10241027
diags.err = getLastDetailedErrorFromDb(db.db);
1025-
return errorFromResultCode(result);
1028+
return errors.errorFromResultCode(result);
10261029
}
10271030
break :blk tmp.?;
10281031
};
@@ -1181,7 +1184,7 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
11811184
c.SQLITE_DONE => {},
11821185
else => {
11831186
diags.err = getLastDetailedErrorFromDb(self.db);
1184-
return errorFromResultCode(result);
1187+
return errors.errorFromResultCode(result);
11851188
},
11861189
}
11871190
}

0 commit comments

Comments
 (0)