support custom indexing policy for collections

Author: dennwc

client.go

@@ -94,7 +94,7 @@ func (c *Client) Query(link string, query *Query, out interface{}) (string, erro
 	req.QueryHeaders(n, tok)
 	resp, err := c.do(req, out)
 	if err != nil {
-		if DebugQueries {
+		if DebugQueries && resp != nil {
 			log.Printf("docdb: %+v, cost: %v RU, error: %v", query, resp.Header.Get(HEADER_CHARGE), err)
 		}
 		return "", err
@@ -112,7 +112,10 @@ func (c *Client) Create(link string, body, ret interface{}, headers map[string]s
 		return err
 	}
 	buf := bytes.NewBuffer(data)
-	_, err = c.method("POST", link, ret, buf, headers)
+	resp, err := c.method("POST", link, ret, buf, headers)
+	if DebugQueries && resp != nil {
+		log.Println("docdb create:", body, "cost:", resp.Header.Get(HEADER_CHARGE), "RU", "error:", err)
+	}
 	return err
 }
 

documentdb.go

@@ -95,18 +95,22 @@ func (db *DB) Delete() error {
 	return db.c.DeleteDatabase(db.Self)
 }
 
-func (db *DB) CreateCollection(id string) (*Col, error) {
-	c, err := db.c.CreateCollection(db.Self, map[string]string{"id": id})
+func (db *DB) CreateCollection(id string, col *Collection) (*Col, error) {
+	if col == nil {
+		col = &Collection{}
+	}
+	col.Id = id
+	c, err := db.c.CreateCollection(db.Self, col)
 	if err != nil {
 		return nil, err
 	}
 	return &Col{db: db, Collection: *c}, nil
 }
 
-func (db *DB) CreateCollectionIfNotExists(id string) (*Col, error) {
+func (db *DB) CreateCollectionIfNotExists(id string, col *Collection) (*Col, error) {
 	c, err := db.C(id)
 	if err == ErrNotFound {
-		if c, err = db.CreateCollection(id); IsExists(err) {
+		if c, err = db.CreateCollection(id, col); IsExists(err) {
 			c, err = db.C(id)
 		}
 	}

models.go

@@ -2,52 +2,95 @@ package documentdb
 
 // Resource
 type Resource struct {
-	Id	string	`json:"id,omitempty"`
-	Self	string	`json:"_self,omitempty"`
-	Etag	string	`json:"_etag,omitempty"`
-	Rid	string	`json:"_rid,omitempty"`
-	Ts	int	`json:"_ts,omitempty"`
+	Id   string `json:"id,omitempty"`
+	Self string `json:"_self,omitempty"`
+	Etag string `json:"_etag,omitempty"`
+	Rid  string `json:"_rid,omitempty"`
+	Ts   int    `json:"_ts,omitempty"`
 }
 
+type IndexingMode string
+
+const (
+	Consistent = IndexingMode("Consistent")
+	Lazy       = IndexingMode("Lazy")
+)
+
 // Indexing policy
-// TODO: Ex/IncludePaths
 type IndexingPolicy struct {
-	IndexingMode	string	`json: "indexingMode,omitempty"`
-	Automatic	bool	`json: "automatic,omitempty"`
+	IndexingMode IndexingMode   `json:"indexingMode,omitempty"`
+	Automatic    bool           `json:"automatic"`
+	Included     []IncludedPath `json:"includedPaths,omitempty"`
+	Excluded     []ExcludedPath `json:"excludedPaths,omitempty"`
+}
+
+type DataType string
+
+const (
+	StringType     = DataType("String")
+	NumberType     = DataType("Number")
+	PointType      = DataType("Point")
+	PolygonType    = DataType("Polygon")
+	LineStringType = DataType("LineString")
+)
+
+type IndexKind string
+
+const (
+	Hash    = IndexKind("Hash")
+	Range   = IndexKind("Range")
+	Spatial = IndexKind("Spatial")
+)
+
+const MaxPrecision = -1
+
+type Index struct {
+	DataType  DataType  `json:"dataType,omitempty"`
+	Kind      IndexKind `json:"kind,omitempty"`
+	Precision int       `json:"precision,omitempty"`
+}
+
+type IncludedPath struct {
+	Path    string  `json:"path"`
+	Indexes []Index `json:"indexes,omitempty"`
+}
+
+type ExcludedPath struct {
+	Path string `json:"path"`
 }
 
 // Database
 type Database struct {
 	Resource
-	Colls	string	`json:"_colls,omitempty"`
-	Users	string	`json:"_users,omitempty"`
+	Colls string `json:"_colls,omitempty"`
+	Users string `json:"_users,omitempty"`
 }
 
 // Collection
 type Collection struct {
 	Resource
-	IndexingPolicy	IndexingPolicy	`json:"indexingPolicy,omitempty"`
-	Docs		string		`json:"_docs,omitempty"`
-	Udf		string		`json:"_udfs,omitempty"`
-	Sporcs		string		`json:"_sporcs,omitempty"`
-	Triggers	string		`json:"_triggers,omitempty"`
-	Conflicts	string		`json:"_conflicts,omitempty"`
+	IndexingPolicy *IndexingPolicy `json:"indexingPolicy,omitempty"`
+	Docs           string          `json:"_docs,omitempty"`
+	Udf            string          `json:"_udfs,omitempty"`
+	Sporcs         string          `json:"_sporcs,omitempty"`
+	Triggers       string          `json:"_triggers,omitempty"`
+	Conflicts      string          `json:"_conflicts,omitempty"`
 }
 
 // Document
 type Document struct {
 	Resource
-	attachments	string	`json: "attachments,omitempty"`
+	Attachments string `json:"attachments,omitempty"`
 }
 
 // Stored Procedure
 type Sproc struct {
 	Resource
-	Body	string	`json:"body,omitempty"`
+	Body string `json:"body,omitempty"`
 }
 
 // User Defined Function
 type UDF struct {
 	Resource
-	Body	string	`json:"body,omitempty"`
+	Body string `json:"body,omitempty"`
 }