summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Adamansky <adamansky@gmail.com>2015-04-22 21:49:10 +0600
committerAnton Adamansky <adamansky@gmail.com>2015-04-22 21:49:10 +0600
commit26f2da7cbd573126453b5e4df6d9f159a44e2c2c (patch)
treeb111c625d803d24874a283c532902446fc0b39db
parent1c17a66d59781b38a63edf6708f659c3d665b71a (diff)
downloadejdb-26f2da7cbd573126453b5e4df6d9f159a44e2c2c.tar.gz
ejdb-26f2da7cbd573126453b5e4df6d9f159a44e2c2c.tar.bz2
ejdb-26f2da7cbd573126453b5e4df6d9f159a44e2c2c.zip
minors
-rw-r--r--Changelog1
-rw-r--r--src/ejdb/ejdb.h14
2 files changed, 8 insertions, 7 deletions
diff --git a/Changelog b/Changelog
index b66c384..46a2eaa 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
ejdb (1.2.7) UNRELEASED; urgency=low
+ * EJDB nodejs modules now published as precompiled binaries for Windows
* Project build improvements #131
* Fix of Nodejs module windows build fail #12
* Added support of querying BSON symbols #129
diff --git a/src/ejdb/ejdb.h b/src/ejdb/ejdb.h
index bb07773..d2a6c4e 100644
--- a/src/ejdb/ejdb.h
+++ b/src/ejdb/ejdb.h
@@ -542,9 +542,9 @@ EJDB_EXPORT bson* ejdbmeta(EJDB *jb);
/** Export/Import settings used in `ejdbexport()` and `ejdbimport()` functions. */
enum {
- JBJSONEXPORT = 1, //If set json collection data will be exported as JSON files instead of BSON.
- JBIMPORTUPDATE = 1 << 1, //Update existing collection entries with imported ones. Collections will not be recreated and its options are ignored.
- JBIMPORTREPLACE = 1 << 2 //Recreate existing collections and replace all collection data with imported entries.
+ JBJSONEXPORT = 1, //Database collections will be exported as JSON files.
+ JBIMPORTUPDATE = 1 << 1, //Update existing collection entries with imported ones. Missing collections will be created.
+ JBIMPORTREPLACE = 1 << 2 //Recreate all collections and replace all collection data with imported entries.
};
/**
@@ -595,7 +595,7 @@ EJDB_EXPORT bool ejdbimport(EJDB *jb, const char *path, TCLIST *cnames, int flag
* 1) Exports database collections data. See ejdbexport() method.
*
* "export" : {
- * "path" : string, //Exports database collections data
+ * "path" : string, //Export files target directory
* "cnames" : [string array]|null, //List of collection names to export
* "mode" : int|null //Values: null|`JBJSONEXPORT` See ejdbexport() method
* }
@@ -610,8 +610,8 @@ EJDB_EXPORT bool ejdbimport(EJDB *jb, const char *path, TCLIST *cnames, int flag
* 2) Imports previously exported collections data into ejdb.
*
* "import" : {
- * "path" : string //The directory path in which data resides
- * "cnames" : [string array]|null, //List of collection names to import
+ * "path" : string //Import files source directory
+ * "cnames" : [string array]|null, //List of collection names to import
* "mode" : int|null //Values: null|`JBIMPORTUPDATE`|`JBIMPORTREPLACE` See ejdbimport() method
* }
*
@@ -624,7 +624,7 @@ EJDB_EXPORT bool ejdbimport(EJDB *jb, const char *path, TCLIST *cnames, int flag
*
* @param jb EJDB database handle.
* @param cmd BSON command spec.
- * @return Allocated BSON command response object. Caller should call `bson_del()` on it.
+ * @return Allocated command response BSON object. Caller should call `bson_del()` on it.
*/
EJDB_EXPORT bson* ejdbcommand(EJDB *jb, bson *cmdbson);
EJDB_EXPORT bson* ejdbcommand2(EJDB *jb, void *cmdbsondata);