Upgrade libraries and use docker-compose

Author: luisvargastije

.travis.yml

@@ -1,20 +1,9 @@
-language: dart
-dart:
-  - stable
-  - dev
+sudo: required
+install:
+  - curl -sSL https://get.docker.com/ | sudo sh
+  - sudo pip install docker-compose
 script:
-  - pub global activate dart_coveralls
-  - pub run test/mongodb_integration_test.dart
-  - pub run test/mysql_integration_test.dart
-  - pub run test/postgres_integration_test.dart
-  - dart_coveralls calc test/test.dart
-  - dart_coveralls report --exclude-test-files --token=$COVERALLS_TOKEN test/test.dart
-before_script:
-  - psql -c 'create database dart_orm;' -U postgres
-services:
-  - mongodb
-env:
-  global:
-    - MYSQL_USER=root
-    - PSQL_USER=postgres
-    - PSQL_DB=dart_orm
+  - docker-compose build
+  - docker-compose up -d mysql mongo postgres
+  - sleep 2m
+  - docker-compose run --rm test

docker-compose.yaml

@@ -0,0 +1,40 @@
+version: '3.0'
+services:
+  mongo:
+    image: mongo
+    ports:
+      - 27000:27017
+    environment:
+#      - MONGO_INITDB_ROOT_USERNAME="dart_orm_test"
+#      - MONGO_INITDB_ROOT_PASSWORD="dart_orm_test"
+      - MONGO_INITDB_DATABASE="dart_orm_test"
+  postgres:
+    image: postgres
+    ports:
+      - 5000:5432
+    environment:
+      - POSTGRES_PASSWORD=dart_orm_test
+      - POSTGRES_USER=dart_orm_test
+      - POSTGRES_DB=dart_orm_test
+  mysql:
+    image: mysql:5.7
+    ports:
+      - 3000:3306
+    environment:
+      - MYSQL_RANDOM_ROOT_PASSWORD=true
+      - MYSQL_DATABASE=dart_orm_test
+      - MYSQL_USER=dart_orm_test
+      - MYSQL_PASSWORD=dart_orm_test
+  test:
+    image: google/dart:dev
+    command: bash -c "pub get && pub run test"
+    working_dir: /project
+    volumes:
+      - .:/project
+      - ~/.pub-cache:/root/.pub-cache
+    depends_on:
+      - mongo
+      - postgres
+      - mysql
+    environment:
+      - USE_DOCKER=true

lib/src/operations.dart

@@ -117,7 +117,7 @@ class Join {
   Join(this.joinType, this.tableName, this.tableAlias, this.joinCondition);
 }
 
-class Select extends SQL {
+class Select {
   final Map<String, String> sorts = new Map<String, String>();
   final List<Join> joins = new List<Join>();
 

pubspec.yaml

@@ -6,6 +6,21 @@ author: Ustimenko Sergey <[email protected]>
 homepage: https://github.com/ustims/DartORM
 dev_dependencies:
   test: '^0.12.5'
-  dart_orm_adapter_postgresql: '^0.1.0'
-  dart_orm_adapter_mongodb: '^0.1.3'
-  dart_orm_adapter_mysql: '^0.1.4'
+#  dart_orm_adapter_postgresql: '^0.1.0'
+  dart_orm_adapter_postgresql:
+#    path: ../DartORM-PostgreSQL
+    git:
+      url: https://github.com/DartOrm/DartORM-PostgreSQL
+      ref: upgrade-libraries
+#  dart_orm_adapter_mongodb: '^0.1.3'
+  dart_orm_adapter_mongodb:
+#    path: ../DartORM-MongoDB
+    git:
+      url: https://github.com/DartOrm/DartORM-MongoDB
+      ref: upgrade-libraries
+#  dart_orm_adapter_mysql: '^0.1.4'
+  dart_orm_adapter_mysql:
+#    path: ../DartORM-MySQL
+    git:
+      url: https://github.com/DartOrm/DartORM-MySQL
+      ref: upgrade-libraries

test/integration/test_basic_integration.dart

@@ -125,7 +125,7 @@ Future dateTimeTestCase() async {
 
   User futureUser = new User()
     ..givenName = 'Bilbo'
-    ..created = new DateTime(2500, DateTime.JANUARY, 1, 12, 12, 12);
+    ..created = new DateTime(2500, DateTime.january, 1, 12, 12, 12);
   await futureUser.save();
 
   // TODO: timezones need to be tested.

test/integration/test_lists.dart

@@ -1,4 +1,4 @@
-library dart_orm.test_basic_integration;
+library dart_orm.test_lists;
 
 import 'dart:async';
 

test/mongodb_integration_test.dart

@@ -1,55 +1,31 @@
 library dart_orm.mongodb_integration_test;
 
+import 'dart:io';
+
 import 'package:dart_orm_adapter_mongodb/dart_orm_adapter_mongodb.dart';
 import 'package:logging/logging.dart';
+import 'package:mongo_dart/mongo_dart.dart';
 import 'package:test/test.dart';
 
-import 'test_util.dart';
 import 'integration/test_integration.dart';
 
 const String dbUserName = 'dart_orm_test';
 const String dbName = 'dart_orm_test';
 
-void setupDBs() {
+void setupDBs(String dbString) async {
   // mongodb teardown
-  run('mongo', [
-    '$dbName',
-    '--eval',
-    """
-  db.runCommand( { dropAllUsersFromDatabase: 1, writeConcern: { w: "majority" } } );
-  db.dropDatabase();
-  """
-  ]);
-
-  log.info('---- MongoDB Setup -----');
-  // mongodb setup
-  run('mongo', [
-    '$dbName',
-    '--eval',
-    """
-  if (db.version().toString().indexOf('2.4') > -1) {
-      db.addUser(
-          {
-              user: "$dbUserName",
-              pwd: "$dbUserName",
-              roles: ["readWrite"]
-          }
-      );
-  } else {
-      db.createUser(
-          {
-              user: "$dbUserName",
-              pwd: "$dbUserName",
-              roles: [{role: "userAdmin", db: "$dbName"}]
-          }
-      );
-  }
-  """
-  ]);
+  var db = new Db('mongodb://$dbString/dart_orm_test');
+  await db.open();
+  await db.drop();
+  await db.close();
 }
 
 void main() {
-  setUpAll(() {
+  var useDocker = Platform.environment['USE_DOCKER'] == 'true';
+
+  var dbString = useDocker ? 'mongo:27017': 'localhost:27000';
+
+  setUpAll(() async {
     Logger.root.level = Level.FINEST;
     Logger.root.onRecord.listen((LogRecord rec) {
       if (rec.loggerName.contains('DartORM')) {
@@ -58,11 +34,11 @@ void main() {
       }
     });
 
-    setupDBs();
+    await setupDBs(dbString);
   });
 
   MongoDBAdapter mongoAdapter = new MongoDBAdapter(
-      'mongodb://dart_orm_test:[email protected]/dart_orm_test');
+      'mongodb://$dbString/dart_orm_test');
 
   registerTestsForAdapter('mongodb', mongoAdapter);
 

test/mysql_integration_test.dart

@@ -4,39 +4,33 @@ import 'dart:io';
 
 import 'package:dart_orm_adapter_mysql/dart_orm_adapter_mysql.dart';
 import 'package:logging/logging.dart';
+import 'package:sqljocky5/sqljocky.dart';
 import 'package:test/test.dart';
 
-import 'test_util.dart';
 import 'integration/test_integration.dart';
 
 const String dbUserName = 'dart_orm_test';
 const String dbName = 'dart_orm_test';
 
-void setupMySql(mysqlUser) {
-  void runMySql(String command) {
-    run('mysql', ['-e', command, '-v', '-u', mysqlUser]);
-  }
-
-  log.info('---- MySQL Teardown -----');
-  runMySql('DROP DATABASE $dbName;');
-  runMySql('DROP USER \'$dbUserName\'@\'localhost\';');
+void setupMySql(String dbString) async {
+  var dbStringParts = dbString.split(':');
+  var pool = new ConnectionPool(
+      host: dbStringParts[0], port: int.parse(dbStringParts[1]),
+      user: 'dart_orm_test', password: 'dart_orm_test',
+      db: 'dart_orm_test', max: 5);
 
-  log.info('---- MySQL Setup -----');
-  runMySql('CREATE DATABASE $dbName;');
-  runMySql(
-      'CREATE USER \'$dbUserName\'@\'localhost\' IDENTIFIED BY \'$dbUserName\';');
-  runMySql('GRANT ALL ON $dbName.* TO \'$dbUserName\'@\'localhost\';');
-  runMySql('FLUSH PRIVILEGES;');
+  var rows = await pool.query("SELECT table_name FROM information_schema.tables WHERE table_schema = 'dart_orm_test'");
+  await for(var row in rows) {
+    await pool.query('DROP TABLE IF EXISTS ${row[0]} CASCADE');
+  }
 }
 
 void main() {
-  setUpAll(() {
-    String MYSQL_USER = Platform.environment['MYSQL_USER'];
+  var useDocker = Platform.environment['USE_DOCKER'] == 'true';
 
-    if (MYSQL_USER == null || MYSQL_USER.isEmpty) {
-      throw 'MYSQL_USER must be set in the environment';
-    }
+  var dbString = useDocker ? 'mysql:3306': 'localhost:3000';
 
+  setUpAll(() async {
     Logger.root.level = Level.FINEST;
     Logger.root.onRecord.listen((LogRecord rec) {
       if (rec.loggerName.contains('DartORM')) {
@@ -45,11 +39,11 @@ void main() {
       }
     });
 
-    setupMySql(MYSQL_USER);
+    await setupMySql(dbString);
   });
 
   MySQLDBAdapter mysqlAdapter = new MySQLDBAdapter(
-      'mysql://dart_orm_test:dart_orm_test@localhost:3306/dart_orm_test');
+      'mysql://dart_orm_test:dart_orm_test@$dbString/dart_orm_test');
 
   registerTestsForAdapter('mysql', mysqlAdapter);
 

test/postgres_integration_test.dart

@@ -1,64 +1,29 @@
 library dart_orm.postgres_integration_test;
 
+import 'dart:async';
 import 'dart:io';
 
 import 'package:dart_orm_adapter_postgresql/dart_orm_adapter_postgresql.dart';
 import 'package:logging/logging.dart';
+import 'package:postgresql/postgresql.dart';
 import 'package:test/test.dart';
 
-import 'test_util.dart';
 import 'integration/test_integration.dart';
 
-void setupDBs(psql_user, psql_db) {
-  if (psql_user.length < 1 || psql_db.length < 1) {
-    throw new Exception(
-        'PSQL_USER, PSQL_DB environment variables should be provided.');
+Future setupDBs(String dbString) async {
+  var connection = await connect("postgres://dart_orm_test:dart_orm_test@$dbString/dart_orm_test");
+  var rows = connection.query("select tablename from pg_tables WHERE schemaname = 'public'");
+  await for (var row in rows) {
+    await connection.execute('drop table if exists ${row[0]} cascade');
   }
-
-  String dbUserName = 'dart_orm_test';
-  String dbName = 'dart_orm_test';
-
-  // psql teardown
-  run('psql', ['-c', 'DROP DATABASE $dbName;', '-U', psql_user, psql_db]);
-  run('psql', ['-c', 'DROP ROLE $dbUserName;', '-U', psql_user, psql_db]);
-
-  // psql setup
-  log.info('---- PSQL Setup -----');
-  run('psql', ['-c', 'CREATE DATABASE $dbName;', '-U', psql_user, psql_db]);
-  run('psql', [
-    '-c',
-    'CREATE ROLE $dbUserName WITH PASSWORD \'$dbUserName\' LOGIN;',
-    '-U',
-    psql_user,
-    psql_db
-  ]);
-  run('psql', [
-    '-c',
-    'GRANT ALL PRIVILEGES ON DATABASE $dbName TO $dbUserName;',
-    '-U',
-    psql_user,
-    psql_db
-  ]);
 }
 
 void main() {
-  setUpAll(() {
-    String PSQL_USER = '';
-    String PSQL_DB = '';
+  var useDocker = Platform.environment['USE_DOCKER'] == 'true';
 
-    try {
-      for (String varName in Platform.environment.keys) {
-        if (varName == 'PSQL_USER') {
-          PSQL_USER = Platform.environment[varName];
-        }
-        if (varName == 'PSQL_DB') {
-          PSQL_DB = Platform.environment[varName];
-        }
-      }
-    } catch (e) {
-      log.shout(e);
-    }
+  var dbString = useDocker ? 'postgres:5432': 'localhost:5000';
 
+  setUpAll(() async {
     Logger.root.level = Level.FINEST;
     Logger.root.onRecord.listen((LogRecord rec) {
       if (rec.loggerName.contains('DartORM')) {
@@ -67,11 +32,11 @@ void main() {
       }
     });
 
-    setupDBs(PSQL_USER, PSQL_DB);
+    await setupDBs(dbString);
   });
 
   PostgresqlDBAdapter postgresqlAdapter = new PostgresqlDBAdapter(
-      'postgres://dart_orm_test:dart_orm_test@localhost:5432/dart_orm_test');
+      'postgres://dart_orm_test:dart_orm_test@$dbString/dart_orm_test');
 
   registerTestsForAdapter('postgresql', postgresqlAdapter);