Skip to content

Database version Rename #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cblgh merged 4 commits into from
Nov 16, 2018
Merged

Database version Rename #28

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5b944a
3.1.0
cblgh Nov 7, 2018
bd10b76
rename protocol version to database version
cblgh Nov 14, 2018
1734605
Merge branch 'master' into database-version-rename
cblgh Nov 14, 2018
501b494
Update package.json
cblgh Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ var createMessagesView = require('./views/messages')
var createTopicsView = require('./views/topics')
var createUsersView = require('./views/users')

var PROTOCOL_VERSION = '1.0.0'
var DATABASE_VERSION = 1

module.exports = Cabal
module.exports.protocolVersion = PROTOCOL_VERSION
module.exports.databaseVersion = DATABASE_VERSION

/**
* Create a new cabal. This is the object handling all
Expand Down Expand Up @@ -66,9 +66,9 @@ function Cabal (storage, key, opts) {
}

inherits(Cabal, events.EventEmitter)
Cabal.prototype.getProtocolVersion = function (cb) {
Cabal.prototype.getDatabaseVersion = function (cb) {

@hackergrrl hackergrrl Nov 14, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the code that changes the ~/.cabal/archives dir name already in master, or can that get into this PR too?

@cblgh cblgh Nov 14, 2018 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@noffle it's not in master, but in the multi-cabal pr here cabal-club/cabal-cli#89

(i'm not sure how i would bring it into the cabal-core pr)

@hackergrrl hackergrrl Nov 14, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, of course!

My thinking was "gosh it'd be nice if we could get in the db-dir changes so we can test that separately from the multi-cabal work".

if (!cb) cb = noop
process.nextTick(cb, PROTOCOL_VERSION)
process.nextTick(cb, DATABASE_VERSION)
}

/**
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cabal-core",
"version": "3.0.4",
"version": "3.1.0",
Comment thread
cblgh marked this conversation as resolved.
Outdated
"description": " p2p db functions for chat ",
"main": "index.js",
"scripts": {
Expand Down