[tarantool-patches] [PATCH 2/2] sql: remove unused SQLITE_CONSTRAINT_ error codes

AlexeyIvushkin ivushkinalex at gmail.com
Tue Oct 2 23:50:35 MSK 2018


From: Morgan-iv <ivushkinalex at gmail.com>

Remove SQLITE_CONSTRAINT_ error codes that only defined, but don't used
anywhere. Change its implementation from define macro to enum statement.

Part of #3315
---
 src/box/sql/main.c      |  9 ---------
 src/box/sql/sqliteInt.h | 13 ++++++-------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/box/sql/main.c b/src/box/sql/main.c
index 532d324..885cdcc 100644
--- a/src/box/sql/main.c
+++ b/src/box/sql/main.c
@@ -826,9 +826,6 @@ sqlite3ErrName(int rc)
 		case SQLITE_CONSTRAINT:
 			zName = "SQLITE_CONSTRAINT";
 			break;
-		case SQLITE_CONSTRAINT_UNIQUE:
-			zName = "SQLITE_CONSTRAINT_UNIQUE";
-			break;
 		case SQLITE_CONSTRAINT_TRIGGER:
 			zName = "SQLITE_CONSTRAINT_TRIGGER";
 			break;
@@ -838,15 +835,9 @@ sqlite3ErrName(int rc)
 		case SQLITE_CONSTRAINT_CHECK:
 			zName = "SQLITE_CONSTRAINT_CHECK";
 			break;
-		case SQLITE_CONSTRAINT_PRIMARYKEY:
-			zName = "SQLITE_CONSTRAINT_PRIMARYKEY";
-			break;
 		case SQLITE_CONSTRAINT_NOTNULL:
 			zName = "SQLITE_CONSTRAINT_NOTNULL";
 			break;
-		case SQLITE_CONSTRAINT_FUNCTION:
-			zName = "SQLITE_CONSTRAINT_FUNCTION";
-			break;
 		case SQLITE_MISMATCH:
 			zName = "SQLITE_MISMATCH";
 			break;
diff --git a/src/box/sql/sqliteInt.h b/src/box/sql/sqliteInt.h
index 00c0309..5c031e1 100644
--- a/src/box/sql/sqliteInt.h
+++ b/src/box/sql/sqliteInt.h
@@ -619,13 +619,12 @@ enum sql_ioerr_code {
 	SQLITE_IOERR_GETTEMPPATH       = (SQLITE_IOERR | (11<<8))
 };
 
-#define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
-#define SQLITE_CONSTRAINT_FOREIGNKEY   (SQLITE_CONSTRAINT | (3<<8))
-#define SQLITE_CONSTRAINT_FUNCTION     (SQLITE_CONSTRAINT | (4<<8))
-#define SQLITE_CONSTRAINT_NOTNULL      (SQLITE_CONSTRAINT | (5<<8))
-#define SQLITE_CONSTRAINT_PRIMARYKEY   (SQLITE_CONSTRAINT | (6<<8))
-#define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
-#define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))
+enum sql_constrant_code {
+	SQLITE_CONSTRAINT_CHECK        = (SQLITE_CONSTRAINT | (1<<8)),
+	SQLITE_CONSTRAINT_FOREIGNKEY   = (SQLITE_CONSTRAINT | (2<<8)),
+	SQLITE_CONSTRAINT_NOTNULL      = (SQLITE_CONSTRAINT | (3<<8)),
+	SQLITE_CONSTRAINT_TRIGGER      = (SQLITE_CONSTRAINT | (4<<8))
+};
 
 enum sql_type {
 	SQLITE_INTEGER = 1,
-- 
2.7.4





More information about the Tarantool-patches mailing list