Skip to content

Compatibility with Sails v1 #36

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compatibility with Sails v1 #36

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b45377
sails v1.x.x compatibility
ochicf Jun 3, 2019
3598f49
update readme
ochicf Jun 3, 2019
fa2506a
fix: properly assign connection from datastores
ochicf Jun 4, 2019
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
12 changes: 8 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ which provides [grunt][] tasks for running and creating migrations. It also
extracts the database configuration from the Sails config, so you don't have to
duplicate you config in a `database.json` file.

Supports Sails 0.10.x.
Supports Sails 0.10.x and 1.x.x

## Setup

Expand All @@ -31,8 +31,10 @@ use to run migrations.
```JavaScript
// config/migrations.js
module.exports.migrations = {
// connection name matches a field from config/connections.js
connection: 'somePostgresqlServer' // or MySQL
// v0.10.x -> connection name matches a field from config/connections.js
connection: 'somePostgresqlServer', // or MySQL
// v1.x.x -> datastore name matches a field from config/datastores.js
datastore: 'somePostgresqlServer' // or MySQL
};
```

Expand All @@ -44,8 +46,10 @@ file for the migrations instead of javascript file (defaults to `false`).
```JavaScript
// config/migrations.js
module.exports.migrations = {
// connection name matches a field from config/connections.js
// v0.10.x -> connection name matches a field from config/connections.js
connection: 'somePostgresqlServer', // or MySQL
// v1.x.x -> datastore name matches a field from config/datastores.js
datastore: 'somePostgresqlServer' // or MySQL
table: 'sails_migrations',
migrationsDir: 'sails_migrations',
coffeeFile: true
Expand Down
25 changes: 20 additions & 5 deletions lib/sailsDbMigrate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,30 @@ function parseSailsConfig(sailsConfig) {
throw new Error('Migrations not configured. Please setup ./config/migrations.js');
}

var connectionName = sailsConfig.migrations.connection;
var connectionName =
sailsConfig.migrations.datastore ||
// backwards compatibility: v0.10.x
sailsConfig.migrations.connection;
if (!connectionName) {
throw new Error('connection missing from ./config/migrations.js');
throw new Error(
'Migrations not configured. Please specify either datastore (v1.x.x) or ' +
'connection (v0.10.x) in ./config/migrations.js'
);
}

if (sailsConfig.connections) {
// backwards compatibility: v0.10.x
connection = sailsConfig.connections[connectionName]
} else if (sailsConfig.datastores) {
// v1.x.x
sailsConfig.datastores[connectionName]
Copy link

@booyokkk booyokkk Jun 4, 2019

Choose a reason for hiding this comment

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

connection = sailsConfig.datastores[connectionName]

Copy link
Author

@ochicf ochicf Jun 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Good catch, missed that after transforming it from the nested ternary operator.

Fixed in fa2506a

}

connection = sailsConfig.connections[connectionName];

if (!connection) {
throw new Error('could not find connection ' + connectionName + ' in ./config/connections.js');
throw new Error(
`Migrations bad configuration. Could not find ${sailsConfig.connections ? 'connection' : 'datastore'} ` +
`'${connectionName}' in ./config/${sailsConfig.connections ? 'connections' : 'datastores'}.js`
);
}

// build the db url, which contains the password
Expand Down