[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] org.debian.monotone: bc4087bd157d21a788ad9096c3
From: |
code |
Subject: |
[Monotone-commits-diffs] org.debian.monotone: bc4087bd157d21a788ad9096c3b1fcaeccfe2fd3 |
Date: |
Mon, 11 Mar 2013 21:54:34 +0100 (CET) |
revision: bc4087bd157d21a788ad9096c3b1fcaeccfe2fd3
date: 2010-10-26T23:47:05
author: Richard Levitte <address@hidden>
branch: org.debian.monotone
changelog:
I bow to those who have better control on how to do Debian stuff
manifest:
format_version "1"
new_manifest [b6e0440e62c9edfb8941eebd5352a224d8058ef2]
old_revision [8f2bc17718b40cb82e9b3bec5aceba31bbf2cb8f]
delete "patches/01-database.cc.diff"
============================================================
--- patches/01-database.cc.diff 665f7d49b645df16a5b38298bc887504a49c04a5
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# SQLite 3.7.3 and later does consistently return a NULL pointer
-# for empty or NULL blobs, just as documented. We've just been
-# lucky enough in the past to always get back an empty string
-# before...
-#
-# patch "database.cc"
-# from [0afa3ff4bd9c9ee3bc62b10bcf6295a9f5388d64]
-# to [8bfff559a0894259fe3668294bd3906ae837129b]
-#
-============================================================
---- monotone-0.48.orig/database.cc 0afa3ff4bd9c9ee3bc62b10bcf6295a9f5388d64
-+++ monotone-0.48/database.cc 8bfff559a0894259fe3668294bd3906ae837129b
-@@ -1489,12 +1489,19 @@ database_impl::fetch(results & res,
- vector<string> row;
- for (int col = 0; col < ncol; col++)
- {
-+ // We never store NULLs, so we should never see one.
-+ int const datatype = sqlite3_column_type(i->second.stmt(), col);
-+ E(datatype != SQLITE_NULL, origin::database,
-+ F("null result in query: %s") % query.sql_cmd);
- const char * value = (const char*)sqlite3_column_blob(i->second.stmt(), col);
- int bytes = sqlite3_column_bytes(i->second.stmt(), col);
-- E(value, origin::database,
-- F("null result in query: %s") % query.sql_cmd);
-- row.push_back(string(value, value + bytes));
-- //L(FL("row %d col %d value='%s'") % nrow % col % value);
-+ if (value) {
-+ row.push_back(string(value, value + bytes));
-+ } else {
-+ // sqlite3_column_blob() returns null for zero-length
-+ I(bytes == 0);
-+ row.push_back(string());
-+ }
- }
- res.push_back(row);
- }
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] org.debian.monotone: bc4087bd157d21a788ad9096c3b1fcaeccfe2fd3,
code <=