refactor: reformat sql

internal/rhash/tx.go

@@ -12,60 +12,60 @@ const (
 	sqlCount = `
 	select count(field)
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and field in (:fields)`
 
 	sqlDelete = `
 	delete from rhash
 	where key_id = (
-	    select id from rkey where key = ?
-	    and (etime is null or etime > ?)
-	  ) and field in (:fields)`
+			select id from rkey
+			where key = ? and (etime is null or etime > ?)
+		) and field in (:fields)`
 
 	sqlFields = `
 	select field
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ?`
 
 	sqlGet = `
 	select value
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and field = ?`
 
 	sqlGetMany = `
 	select field, value
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and field in (:fields)`
 
 	sqlItems = `
 	select field, value
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ?`
 
 	sqlLen = `
 	select count(field)
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ?`
 
 	sqlScan = `
 	select rhash.rowid, field, value
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and rhash.rowid > ? and field glob ?
 	limit ?`
 
 	sqlSet1 = `
 	insert into rkey (key, type, version, mtime)
 	values (?, ?, ?, ?)
 	on conflict (key) do update set
-	  version = version+1,
-	  type = excluded.type,
-	  mtime = excluded.mtime`
+		version = version+1,
+		type = excluded.type,
+		mtime = excluded.mtime`
 
 	sqlSet2 = `
 	insert into rhash (key_id, field, value)
@@ -76,7 +76,7 @@ const (
 	sqlValues = `
 	select value
 	from rhash
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ?`
 )
 

internal/rkey/tx.go

@@ -14,8 +14,8 @@ const (
 	where key in (:keys) and (etime is null or etime > ?)`
 
 	sqlDelete = `
-	delete from rkey where key in (:keys)
-	and (etime is null or etime > ?)`
+	delete from rkey
+	where key in (:keys) and (etime is null or etime > ?)`
 
 	sqlDeleteAll = `
 	delete from rkey;
@@ -29,9 +29,9 @@ const (
 	sqlDeleteNExpired = `
 	delete from rkey
 	where rowid in (
-	  select rowid from rkey
-	  where etime <= ?
-	  limit ?
+		select rowid from rkey
+		where etime <= ?
+		limit ?
 	)`
 
 	sqlExpire = `
@@ -58,20 +58,18 @@ const (
 
 	sqlRename = `
 	update or replace rkey set
-	  id = old.id,
-	  key = ?,
-	  type = old.type,
-	  version = old.version+1,
-	  etime = old.etime,
-	  mtime = ?
+		id = old.id,
+		key = ?,
+		type = old.type,
+		version = old.version+1,
+		etime = old.etime,
+		mtime = ?
 	from (
-	  select id, key, type, version, etime, mtime
-	  from rkey
-	  where key = ? and (etime is null or etime > ?)
+		select id, key, type, version, etime, mtime
+		from rkey
+		where key = ? and (etime is null or etime > ?)
 	) as old
-	where rkey.key = ? and (
-	  rkey.etime is null or rkey.etime > ?
-	)`
+	where rkey.key = ? and (rkey.etime is null or rkey.etime > ?)`
 
 	sqlScan = `
 	select id, key, type, version, etime, mtime from rkey

internal/rlist/tx.go

@@ -13,9 +13,9 @@ const (
 	sqlDelete = `
 	delete from rlist
 	where key_id = (
-		select id from rkey where key = ?
-		and (etime is null or etime > ?)
-	) and elem = ?`
+			select id from rkey
+			where key = ? and (etime is null or etime > ?)
+		) and elem = ?`
 
 	sqlDeleteBack = `
 	with ids as (

internal/rstring/tx.go

@@ -12,23 +12,23 @@ const (
 	sqlGet = `
 	select value
 	from rstring
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ?`
 
 	sqlGetMany = `
 	select key, value
 	from rstring
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+	join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key in (:keys)`
 
 	sqlSet1 = `
 	insert into rkey (key, type, version, etime, mtime)
 	values (?, ?, ?, ?, ?)
 	on conflict (key) do update set
-	  version = version+1,
-	  type = excluded.type,
-	  etime = excluded.etime,
-	  mtime = excluded.mtime`
+		version = version+1,
+		type = excluded.type,
+		etime = excluded.etime,
+		mtime = excluded.mtime`
 
 	sqlSet2 = `
 	insert into rstring (key_id, value)
@@ -40,10 +40,10 @@ const (
 	insert into rkey (key, type, version, etime, mtime)
 	values (?, ?, ?, null, ?)
 	on conflict (key) do update set
-	  version = version+1,
-	  type = excluded.type,
-	  -- not changing etime
-	  mtime = excluded.mtime`
+		version = version+1,
+		type = excluded.type,
+		-- not changing etime
+		mtime = excluded.mtime`
 
 	sqlUpdate2 = `
 	insert into rstring (key_id, value)

internal/rzset/delete.go

@@ -9,25 +9,24 @@ import (
 const (
 	sqlDeleteRank = `
 	with ranked as (
-	select rowid, elem, score
-	from rzset
-	where key_id = (
-		select id from rkey where key = ?
-		and (etime is null or etime > ?)
-	  )
-	order by score, elem
-	limit ?, ?
+		select rowid, elem, score
+		from rzset
+		where key_id = (
+			select id from rkey
+			where key = ? and (etime is null or etime > ?)
+		)
+		order by score, elem
+		limit ?, ?
 	)
 	delete from rzset
 	where rowid in (select rowid from ranked)`
 
 	sqlDeleteScore = `
 	delete from rzset
 	where key_id = (
-	    select id from rkey where key = ?
-		and (etime is null or etime > ?)
-	  )
-	  and score between ? and ?`
+			select id from rkey
+			where key = ? and (etime is null or etime > ?)
+		) and score between ? and ?`
 )
 
 // DeleteCmd removes elements from a set.

internal/rzset/inter.go

@@ -14,7 +14,7 @@ const (
 	sqlInter = `
 	select elem, sum(score) as score
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key in (:keys)
 	group by elem
 	having count(distinct key_id) = ?
@@ -25,22 +25,22 @@ const (
 	where key_id = (
 		select id from rkey where key = ?
 		and (etime is null or etime > ?)
-	  )`
+	)`
 
 	sqlInterStore2 = `
 	insert into rkey (key, type, version, mtime)
 	values (?, ?, ?, ?)
 	on conflict (key) do update set
-	  version = version+1,
-	  type = excluded.type,
-	  mtime = excluded.mtime
+		version = version+1,
+		type = excluded.type,
+		mtime = excluded.mtime
 	returning id`
 
 	sqlInterStore3 = `
 	insert into rzset (key_id, elem, score)
 	select ?, elem, sum(score) as score
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key in (:keys)
 	group by elem
 	having count(distinct key_id) = ?

internal/rzset/range.go

@@ -10,11 +10,11 @@ import (
 const (
 	sqlRangeRank = `
 	with ranked as (
-	  select elem, score, (row_number() over w - 1) as rank
-	  from rzset
-	    join rkey on key_id = rkey.id and (etime is null or etime > ?)
-	  where key = ?
-	  window w as (partition by key_id order by score asc, elem asc)
+		select elem, score, (row_number() over w - 1) as rank
+		from rzset
+			join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		where key = ?
+		window w as (partition by key_id order by score asc, elem asc)
 	)
 	select elem, score
 	from ranked
@@ -24,7 +24,7 @@ const (
 	sqlRangeScore = `
 	select elem, score
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ?
 	and score between ? and ?
 	order by score asc, elem asc`

internal/rzset/tx.go

@@ -14,9 +14,9 @@ const (
 	insert into rkey (key, type, version, mtime)
 	values (?, ?, ?, ?)
 	on conflict (key) do update set
-	  version = version+1,
-	  type = excluded.type,
-	  mtime = excluded.mtime`
+		version = version+1,
+		type = excluded.type,
+		mtime = excluded.mtime`
 
 	sqlAdd2 = `
 	insert into rzset (key_id, elem, score)
@@ -27,29 +27,29 @@ const (
 	sqlCount = `
 	select count(elem)
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and elem in (:elems)`
 
 	sqlCountScore = `
 	select count(elem)
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and score between ? and ?`
 
 	sqlDelete = `
 	delete from rzset
 	where key_id = (
-		select id from rkey where key = ?
-		and (etime is null or etime > ?)
-	  ) and elem in (:elems)`
+			select id from rkey where key = ?
+			and (etime is null or etime > ?)
+		) and elem in (:elems)`
 
 	sqlGetRank = `
 	with ranked as (
-	  select elem, score, (row_number() over w - 1) as rank
-	  from rzset
-		join rkey on key_id = rkey.id and (etime is null or etime > ?)
-	  where key = ?
-	  window w as (partition by key_id order by score asc, elem asc)
+		select elem, score, (row_number() over w - 1) as rank
+		from rzset
+			join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		where key = ?
+		window w as (partition by key_id order by score asc, elem asc)
 	)
 	select rank, score
 	from ranked
@@ -58,16 +58,16 @@ const (
 	sqlGetScore = `
 	select score
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and elem = ?`
 
 	sqlIncr1 = `
 	insert into rkey (key, type, version, mtime)
 	values (?, ?, ?, ?)
 	on conflict (key) do update set
-	  version = version+1,
-	  type = excluded.type,
-	  mtime = excluded.mtime`
+		version = version+1,
+		type = excluded.type,
+		mtime = excluded.mtime`
 
 	sqlIncr2 = `
 	insert into rzset (key_id, elem, score)
@@ -79,13 +79,13 @@ const (
 	sqlLen = `
 	select count(elem)
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ?`
 
 	sqlScan = `
 	select rzset.rowid, elem, score
 	from rzset
-	  join rkey on key_id = rkey.id and (etime is null or etime > ?)
+		join rkey on key_id = rkey.id and (etime is null or etime > ?)
 	where key = ? and rzset.rowid > ? and elem glob ?
 	limit ?`
 )