fix for maxresults being reset on adapter.Open()

tinode · Mar 21, 2019 · 0a77e8e · 0a77e8e
1 parent 8a9f103
commit 0a77e8e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/db/mysql/adapter.go b/server/db/mysql/adapter.go
@@ -67,7 +67,9 @@ func (a *adapter) Open(jsonconfig string) error {
 		a.dbName = defaultDatabase
 	}
 
-	a.maxResults = defaultMaxResults
+	if a.maxResults <= 0 {
+		a.maxResults = defaultMaxResults
+	}
 
 	// This just initializes the driver but does not open the network connection.
 	a.db, err = sqlx.Open("mysql", a.dsn)

diff --git a/server/db/rethinkdb/adapter.go b/server/db/rethinkdb/adapter.go
@@ -85,7 +85,9 @@ func (a *adapter) Open(jsonconfig string) error {
 		a.dbName = config.Database
 	}
 
-	a.maxResults = defaultMaxResults
+	if a.maxResults <= 0 {
+		a.maxResults = defaultMaxResults
+	}
 
 	opts.Database = a.dbName
 	opts.Username = config.Username