summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: e777d7b)
rawpatchinlineside by side (parent: e777d7b)
| author | Daniel Shahaf <[email protected]> | |
| Thu, 18 Aug 2011 09:12:31 +0000 (18 09:12 +0000) | ||
| committer | Daniel Shahaf <[email protected]> | |
| Thu, 18 Aug 2011 09:12:31 +0000 (18 09:12 +0000) |
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1159093@1159103 13f79535-47bb-0310-9956-ffa450edef68
| build/transform_sql.py | patchblobblamehistory | |
| subversion/libsvn_wc/wc-queries.sql | patchblobblamehistory |
diff --git a/build/transform_sql.py b/build/transform_sql.py
--- a/build/transform_sql.py
+++ b/build/transform_sql.py
for line in input.split('\n'):
line = line.replace('"', '\\"')
line = re.sub(r'IS_STRICT_DESCENDANT_OF[(]([A-Za-z_.]+), ([?][0-9]+)[)]',
- r"((\1 > \2 || '/') AND (\1 < \2 || '0')) ",
+ r"((\1) > (\2) || '/' AND (\1) < (\2) || '0') ",
line)
if line.strip():
DELETE FROM nodes
WHERE wc_id = ?1
AND (local_relpath = ?2
- OR ((IS_STRICT_DESCENDANT_OF(local_relpath, ?2))))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND (op_depth < ?3
OR (op_depth = ?3 AND presence = 'base-deleted'))
SELECT local_relpath FROM nodes
WHERE wc_id = ?1 AND op_depth = ?3
AND (parent_relpath = ?2
- OR ((IS_STRICT_DESCENDANT_OF(parent_relpath, ?2))))
+ OR IS_STRICT_DESCENDANT_OF(parent_relpath, ?2))
AND presence == 'not-present'
-- STMT_COMMIT_DESCENDANT_TO_BASE
WHERE wc_id = ?1 AND op_depth = 0
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_INSERT_WCROOT
INSERT INTO wcroot (local_abspath)
WHERE dav_cache IS NOT NULL AND wc_id = ?1 AND op_depth = 0
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_RECURSIVE_UPDATE_NODE_REPO
UPDATE nodes SET repos_id = ?4, dav_cache = NULL
AND repos_id = ?3
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_UPDATE_LOCK_REPOS_ID
UPDATE lock SET repos_id = ?2
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_INSERT_TARGET_WITH_CHANGELIST
INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind)
WHERE N.wc_id = ?1
AND (?2 = ''
OR N.local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(N.local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(N.local_relpath, ?2))
AND A.changelist = ?3
-- STMT_SELECT_TARGETS
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth >= ?3
-- STMT_DELETE_ACTUAL_NODE
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_DELETE_ACTUAL_NODE_WITHOUT_CONFLICT
DELETE FROM actual_node
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND (changelist IS NULL
OR NOT EXISTS (SELECT 1 FROM nodes_current c
WHERE c.wc_id = ?1
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-- STMT_UPDATE_NODE_BASE_DEPTH
UPDATE nodes SET depth = ?3
WHERE wc_id = ?1
AND (?2 = ''
OR local_dir_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_dir_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_dir_relpath, ?2))
AND NOT EXISTS (SELECT 1 FROM nodes
WHERE nodes.wc_id = ?1
AND nodes.local_relpath = wc_lock.local_dir_relpath)
UPDATE nodes SET op_depth = ?3 + 1
WHERE wc_id = ?1
AND (?2 = ''
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = ?3
-- STMT_DOES_NODE_EXIST
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0 AND presence = 'absent'
LIMIT 1
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0
AND presence = 'absent'
WHERE wc_id = ?1
AND (?2 = ''
OR def_local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(def_local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(def_local_relpath, ?2))
-- STMT_UPDATE_EXTERNAL_FILEINFO
UPDATE externals SET recorded_size = ?3, recorded_mod_time = ?4
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND kind = 'dir' AND presence='normal'
AND op_depth=(SELECT MAX(op_depth) FROM nodes o
WHERE o.wc_id = ?1 AND o.local_relpath = n.local_relpath)
SELECT local_relpath FROM nodes n
WHERE wc_id = ?1
AND (local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth >= ?3
AND presence NOT IN ('base-deleted', 'not-present', 'excluded', 'absent')
AND op_depth = (SELECT MAX(op_depth) FROM nodes s
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND presence IN ('normal', 'incomplete')
AND file_external IS NULL
AND op_depth = 0
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0
AND (presence IN ('absent', 'excluded')
OR depth NOT IN ('infinity', 'unknown'))
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth > 0
LIMIT 1
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND properties IS NOT NULL
LIMIT 1
WHERE wc_id = ?1
AND (?2 = ''
OR local_relpath = ?2
- OR (IS_STRICT_DESCENDANT_OF(local_relpath, ?2)))
+ OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = 0
AND kind='file'
AND presence='normal'