added basic sqlite driver

10pearls · Sep 2, 2016 · 333c212 · 333c212
1 parent 7fc08ac
commit 333c212
Show file tree

Hide file tree

Showing 52 changed files with 1,372 additions and 229 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 build/
+coverage/
 node_modules/
 typings/
-coverage/
 npm-debug.log
 config/parameters.json
diff --git a/config/parameters.json b/config/parameters.json
@@ -1,42 +1,48 @@
 {
   "connections": {
     "mysql": {
-      "host": "192.168.99.100",
+      "host": "localhost",
       "port": 3306,
       "username": "root",
       "password": "admin",
       "database": "test"
     },
     "mysqlSecondary": {
-      "host": "192.168.99.100",
+      "host": "localhost",
       "port": 3306,
       "username": "root",
       "password": "admin",
       "database": "test2"
     },
     "mariadb": {
-      "host": "192.168.99.100",
+      "host": "localhost",
       "port": 3307,
       "username": "root",
       "password": "admin",
       "database": "test"
     },
     "mariadbSecondary": {
-      "host": "192.168.99.100",
+      "host": "localhost",
       "port": 3307,
       "username": "root",
       "password": "admin",
       "database": "test2"
     },
+    "sqlite": {
+      "storage": "temp/sqlitedb.db"
+    },
+    "sqliteSecondary": {
+      "storage": "temp/sqlitedb-secondary.db"
+    },
     "postgres": {
-      "host": "192.168.99.100",
+      "host": "localhost",
       "port": 5432,
       "username": "root",
       "password": "admin",
       "database": "test"
     },
     "postgresSecondary": {
-      "host": "192.168.99.100",
+      "host": "localhost",
       "port": 5432,
       "username": "root",
       "password": "admin",

diff --git a/config/parameters.json.dist b/config/parameters.json.dist
@@ -14,6 +14,12 @@
       "password": "admin",
       "database": "test2"
     },
+    "sqlite": {
+      "storage": "temp/sqlitedb.db"
+    },
+    "sqliteSecondary": {
+      "storage": "temp/sqlitedb-secondary.db"
+    },
     "postgres": {
       "host": "localhost",
       "port": 5432,

diff --git a/package.json b/package.json
@@ -43,11 +43,13 @@
     "gulpclass": "0.1.1",
     "mariasql": "^0.2.6",
     "mocha": "^3.0.1",
+    "mssql": "^3.3.0",
     "mysql": "^2.11.1",
     "pg": "^6.0.3",
     "remap-istanbul": "^0.6.4",
     "sinon": "^1.17.5",
     "sinon-chai": "^2.8.0",
+    "sqlite3": "^3.1.4",
     "ts-node": "^1.2.2",
     "tslint": "next",
     "tslint-stylish": "^2.1.0-beta",

diff --git a/sample/sample1-simple-entity/app.ts b/sample/sample1-simple-entity/app.ts
@@ -5,7 +5,7 @@ import {Post} from "./entity/Post";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",
@@ -17,7 +17,7 @@ const options: ConnectionOptions = {
 /*const options: CreateConnectionOptions = {
     driver: "postgres",
     driverOptions: {
-        host: "192.168.99.100",
+        host: "localhost",
         port: 5432,
         username: "test",
         password: "admin",

diff --git a/sample/sample10-mixed/app.ts b/sample/sample10-mixed/app.ts
@@ -9,7 +9,7 @@ import {Category} from "./entity/Category";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample11-all-types-entity/app.ts b/sample/sample11-all-types-entity/app.ts
@@ -5,7 +5,7 @@ import {EverythingEntity} from "./entity/EverythingEntity";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample12-custom-naming-strategy/app.ts b/sample/sample12-custom-naming-strategy/app.ts
@@ -6,7 +6,7 @@ import {CustomNamingStrategy} from "./naming-strategy/CustomNamingStrategy";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample13-everywhere-abstraction/app.ts b/sample/sample13-everywhere-abstraction/app.ts
@@ -8,7 +8,7 @@ import {Blog} from "./entity/Blog";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample14-errors-in-wrong-metdata/app.ts b/sample/sample14-errors-in-wrong-metdata/app.ts
@@ -6,7 +6,7 @@ import {PostAuthor} from "./entity/PostAuthor";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample15-we-are-reactive/app.ts b/sample/sample15-we-are-reactive/app.ts
@@ -5,7 +5,7 @@ import {Post} from "./entity/Post";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample16-indexes/app.ts b/sample/sample16-indexes/app.ts
@@ -5,7 +5,7 @@ import {Post} from "./entity/Post";
 const options: ConnectionOptions = {
     driver: {
         type: "postgres",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 5432,
         username: "root",
         password: "admin",

diff --git a/sample/sample17-versioning/app.ts b/sample/sample17-versioning/app.ts
@@ -5,7 +5,7 @@ import {Post} from "./entity/Post";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample18-lazy-relations/app.ts b/sample/sample18-lazy-relations/app.ts
@@ -7,7 +7,7 @@ import {Category} from "./entity/Category";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample19-one-side-relations/app.ts b/sample/sample19-one-side-relations/app.ts
@@ -8,7 +8,7 @@ import {PostMetadata} from "./entity/PostMetadata";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample2-one-to-one/app.ts b/sample/sample2-one-to-one/app.ts
@@ -11,7 +11,7 @@ import {PostAuthor} from "./entity/PostAuthor";
 const options: ConnectionOptions = {
     driver: {
         type: "postgres",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 5432,
         username: "root",
         password: "admin",

diff --git a/sample/sample20-join-without-relation/app.ts b/sample/sample20-join-without-relation/app.ts
@@ -7,7 +7,7 @@ import {Category} from "./entity/Category";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample21-custom-join-table-column/app.ts b/sample/sample21-custom-join-table-column/app.ts
@@ -7,7 +7,7 @@ import {Category} from "./entity/Category";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample22-closure-table/app.ts b/sample/sample22-closure-table/app.ts
@@ -5,7 +5,7 @@ import {Category} from "./entity/Category";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample23-nested-joins/app.ts b/sample/sample23-nested-joins/app.ts
@@ -7,7 +7,7 @@ import {Category} from "./entity/Category";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample24-schemas/app.ts b/sample/sample24-schemas/app.ts
@@ -7,7 +7,7 @@ import {Post} from "./entity/Post";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample25-insert-from-inverse-side/app.ts b/sample/sample25-insert-from-inverse-side/app.ts
@@ -6,7 +6,7 @@ import {Author} from "./entity/Author";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample26-embedded-tables/app.ts b/sample/sample26-embedded-tables/app.ts
@@ -7,7 +7,7 @@ import {Counters} from "./entity/Counters";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample3-many-to-one/app.ts b/sample/sample3-many-to-one/app.ts
@@ -11,7 +11,7 @@ import {PostAuthor} from "./entity/PostAuthor";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample4-many-to-many/app.ts b/sample/sample4-many-to-many/app.ts
@@ -6,12 +6,15 @@ import {PostDetails} from "./entity/PostDetails";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",
         database: "test"
     },
+    logging: {
+        logQueries: true
+    },
     autoSchemaCreate: true,
     entityDirectories: [__dirname + "/entity/*"]
 };

diff --git a/sample/sample5-subscribers/app.ts b/sample/sample5-subscribers/app.ts
@@ -9,7 +9,7 @@ import {EverythingSubscriber} from "./subscriber/EverythingSubscriber";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample6-abstract-table/app.ts b/sample/sample6-abstract-table/app.ts
@@ -8,7 +8,7 @@ import {Blog} from "./entity/Blog";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample7-pagination/app.ts b/sample/sample7-pagination/app.ts
@@ -7,7 +7,7 @@ import {PostAuthor} from "./entity/PostAuthor";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample8-self-referencing/app.ts b/sample/sample8-self-referencing/app.ts
@@ -5,7 +5,7 @@ import {Category} from "./entity/Category";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/sample/sample9-entity-listeners/app.ts b/sample/sample9-entity-listeners/app.ts
@@ -7,7 +7,7 @@ import {PostAuthor} from "./entity/PostAuthor";
 const options: ConnectionOptions = {
     driver: {
         type: "mysql",
-        host: "192.168.99.100",
+        host: "localhost",
         port: 3306,
         username: "root",
         password: "admin",

diff --git a/src/connection/Connection.ts b/src/connection/Connection.ts
@@ -235,7 +235,7 @@ export class Connection {
         if (dropBeforeSync)
             await this.dropDatabase();
 
-        const schemaCreator = new SchemaBuilder(this.driver, this.entityMetadatas); // todo: use factory there later
+        const schemaCreator = new SchemaBuilder(this.driver, this.entityMetadatas, this.createNamingStrategy()); // todo: use factory there later
         await schemaCreator.create();
     }
 

diff --git a/src/connection/ConnectionManager.ts b/src/connection/ConnectionManager.ts
@@ -9,6 +9,7 @@ import {PostgresDriver} from "../driver/postgres/PostgresDriver";
 import {AlreadyHasActiveConnectionError} from "./error/AlreadyHasActiveConnectionError";
 import {Logger} from "../logger/Logger";
 import {MariaDbDriver} from "../driver/mariadb/MariaDbDriver";
+import {SqliteDriver} from "../driver/sqlite/SqliteDriver";
 
 /**
  * Connection manager holds all connections made to the databases and providers helper management functions 
@@ -120,6 +121,8 @@ export class ConnectionManager {
                 return new PostgresDriver(options, logger);
             case "mariadb":
                 return new MariaDbDriver(options, logger);
+            case "sqlite":
+                return new SqliteDriver(options, logger);
             default:
                 throw new MissingDriverError(options.type);
         }

diff --git a/src/decorator/columns/Column.ts b/src/decorator/columns/Column.ts
@@ -9,13 +9,25 @@ import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
  * Column decorator is used to mark a specific class property as a table column. Only properties decorated with this 
  * decorator will be persisted to the database when entity be saved.
  */
-export function Column(options?: ColumnOptions): Function;
+export function Column(): Function;
 
 /**
  * Column decorator is used to mark a specific class property as a table column. Only properties decorated with this
  * decorator will be persisted to the database when entity be saved.
  */
-export function Column(type?: ColumnType, options?: ColumnOptions): Function;
+export function Column(type: ColumnType): Function;
+
+/**
+ * Column decorator is used to mark a specific class property as a table column. Only properties decorated with this
+ * decorator will be persisted to the database when entity be saved.
+ */
+export function Column(options: ColumnOptions): Function;
+
+/**
+ * Column decorator is used to mark a specific class property as a table column. Only properties decorated with this
+ * decorator will be persisted to the database when entity be saved.
+ */
+export function Column(type: ColumnType, options: ColumnOptions): Function;
 
 /**
  * Column decorator is used to mark a specific class property as a table column. Only properties decorated with this