Author: danielsh
Date: Thu Jun 2 16:51:25 2011
New Revision: 1130649
URL: http://svn.apache.org/viewvc?rev=1130649&view=rev
Log:
SQLite allows PRIMARY KEY columns to contain NULL values (though this
is deprecated). Fix all instance in our schemas to explicitly declare
NOT NULL on PRIMARY KEY columns.
Suggested by: philip
* subversion/libsvn_wc/wc-queries.sql
(revert_list, delete_list): As above.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1130649&r1=1130648&r2=1130649&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Jun 2 16:51:25
2011
@@ -1066,8 +1066,8 @@ DROP TABLE IF EXISTS temp__node_props_ca
DROP TABLE IF EXISTS revert_list;
CREATE TEMPORARY TABLE revert_list (
/* need wc_id if/when revert spans multiple working copies */
- local_relpath TEXT,
- actual INTEGER, /* 1 if an actual row, 0 if a nodes row */
+ local_relpath TEXT NOT NULL,
+ actual INTEGER NOT NULL, /* 1 if an actual row, 0 if a nodes row */
conflict_old TEXT,
conflict_new TEXT,
conflict_working TEXT,
@@ -1144,7 +1144,7 @@ DROP TABLE IF EXISTS delete_list;
CREATE TEMPORARY TABLE delete_list (
/* ### we should put the wc_id in here in case a delete spans multiple
### working copies. queries, etc will need to be adjusted. */
- local_relpath TEXT PRIMARY KEY
+ local_relpath TEXT PRIMARY KEY NOT NULL
)
/* This matches the selection in STMT_INSERT_DELETE_FROM_NODE_RECURSIVE */