mirror of
https://github.com/chaisql/chai.git
synced 2025-10-06 16:18:14 +08:00
Simplify CreateTable and CreateIndex signatures
This commit is contained in:
62
db_test.go
62
db_test.go
@@ -141,7 +141,9 @@ func newTestDB(t testing.TB) (*genji.Tx, func()) {
|
||||
func newTestTable(t testing.TB) (*genji.Table, func()) {
|
||||
tx, fn := newTestDB(t)
|
||||
|
||||
tb, err := tx.CreateTable("test", nil)
|
||||
err := tx.CreateTable("test", nil)
|
||||
require.NoError(t, err)
|
||||
tb, err := tx.GetTable("test")
|
||||
require.NoError(t, err)
|
||||
|
||||
return tb, fn
|
||||
@@ -152,13 +154,15 @@ func TestTxCreateIndex(t *testing.T) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
_, err := tx.CreateTable("test", nil)
|
||||
err := tx.CreateTable("test", nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
idx, err := tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "idxFoo", TableName: "test", FieldName: "foo",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
idx, err := tx.GetIndex("idxFoo")
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, idx)
|
||||
})
|
||||
|
||||
@@ -166,15 +170,15 @@ func TestTxCreateIndex(t *testing.T) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
_, err := tx.CreateTable("test", nil)
|
||||
err := tx.CreateTable("test", nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "idxFoo", TableName: "test", FieldName: "foo",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "idxFoo", TableName: "test", FieldName: "foo",
|
||||
})
|
||||
require.Equal(t, genji.ErrIndexAlreadyExists, err)
|
||||
@@ -184,7 +188,7 @@ func TestTxCreateIndex(t *testing.T) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
_, err := tx.CreateIndex(index.Options{
|
||||
err := tx.CreateIndex(index.Options{
|
||||
IndexName: "idxFoo", TableName: "test", FieldName: "foo",
|
||||
})
|
||||
require.Equal(t, genji.ErrTableNotFound, err)
|
||||
@@ -196,10 +200,10 @@ func TestTxDropIndex(t *testing.T) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
_, err := tx.CreateTable("test", nil)
|
||||
err := tx.CreateTable("test", nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "idxFoo", TableName: "test", FieldName: "foo",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
@@ -223,7 +227,9 @@ func TestTxDropIndex(t *testing.T) {
|
||||
func TestTxReIndex(t *testing.T) {
|
||||
newTestTableFn := func(t *testing.T) (*genji.Tx, *genji.Table, func()) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
tb, err := tx.CreateTable("test", nil)
|
||||
err := tx.CreateTable("test", nil)
|
||||
require.NoError(t, err)
|
||||
tb, err := tx.GetTable("test")
|
||||
require.NoError(t, err)
|
||||
|
||||
for i := 0; i < 10; i++ {
|
||||
@@ -234,13 +240,13 @@ func TestTxReIndex(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "a",
|
||||
TableName: "test",
|
||||
FieldName: "a",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "b",
|
||||
TableName: "test",
|
||||
FieldName: "b",
|
||||
@@ -303,9 +309,14 @@ func TestReIndexAll(t *testing.T) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
tb1, err := tx.CreateTable("test1", nil)
|
||||
err := tx.CreateTable("test1", nil)
|
||||
require.NoError(t, err)
|
||||
tb2, err := tx.CreateTable("test2", nil)
|
||||
tb1, err := tx.GetTable("test1")
|
||||
require.NoError(t, err)
|
||||
|
||||
err = tx.CreateTable("test2", nil)
|
||||
require.NoError(t, err)
|
||||
tb2, err := tx.GetTable("test2")
|
||||
require.NoError(t, err)
|
||||
|
||||
for i := 0; i < 10; i++ {
|
||||
@@ -321,13 +332,13 @@ func TestReIndexAll(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "t1a",
|
||||
TableName: "test1",
|
||||
FieldName: "a",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "t2a",
|
||||
TableName: "test2",
|
||||
FieldName: "a",
|
||||
@@ -554,13 +565,15 @@ func TestTableInsert(t *testing.T) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
_, err := tx.CreateTable("test", nil)
|
||||
err := tx.CreateTable("test", nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
idx, err := tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
IndexName: "idxFoo", TableName: "test", FieldName: "foo",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
idx, err := tx.GetIndex("idxFoo")
|
||||
require.NoError(t, err)
|
||||
|
||||
tb, err := tx.GetTable("test")
|
||||
require.NoError(t, err)
|
||||
@@ -737,26 +750,29 @@ func TestTableIndexes(t *testing.T) {
|
||||
tx, cleanup := newTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
tb, err := tx.CreateTable("test1", nil)
|
||||
err := tx.CreateTable("test1", nil)
|
||||
require.NoError(t, err)
|
||||
_, err = tx.CreateTable("test2", nil)
|
||||
tb, err := tx.GetTable("test1")
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateTable("test2", nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
err = tx.CreateIndex(index.Options{
|
||||
Unique: true,
|
||||
IndexName: "idx1a",
|
||||
TableName: "test1",
|
||||
FieldName: "a",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
Unique: false,
|
||||
IndexName: "idx1b",
|
||||
TableName: "test1",
|
||||
FieldName: "b",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
_, err = tx.CreateIndex(index.Options{
|
||||
err = tx.CreateIndex(index.Options{
|
||||
Unique: false,
|
||||
IndexName: "ifx2a",
|
||||
TableName: "test2",
|
||||
|
Reference in New Issue
Block a user