*: check in changes incurred by make dockertest

Author: tbg

java/hibernate/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Tue Jan 31 17:56:55 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

java/hibernate/gradle/wrapper/gradle-wrapper.properties

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

java/hibernate/gradlew

@@ -10,28 +10,29 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170207160810) do
+ActiveRecord::Schema.define(version: 2017_02_07_160810) do
 
-  create_table "customers", id: :bigint, default: -> { "unique_rowid()" }, force: :cascade do |t|
-    t.text "name", null: false
+  create_table "customers", force: :cascade do |t|
+    t.string "name", null: false
   end
 
   create_table "order_products", id: false, force: :cascade do |t|
     t.bigint "order_id", null: false
     t.bigint "product_id", null: false
+    t.bigserial "rowid", null: false
     t.index ["order_id"], name: "index_order_products_on_order_id"
     t.index ["product_id"], name: "index_order_products_on_product_id"
   end
 
-  create_table "orders", id: :bigint, default: -> { "unique_rowid()" }, force: :cascade do |t|
-    t.decimal "subtotal", null: false
+  create_table "orders", force: :cascade do |t|
+    t.decimal "subtotal", precision: 18, scale: 2, default: "0.0", null: false
     t.bigint "customer_id", null: false
     t.index ["customer_id"], name: "index_orders_on_customer_id"
   end
 
-  create_table "products", id: :bigint, default: -> { "unique_rowid()" }, force: :cascade do |t|
-    t.text "name", null: false
-    t.decimal "price", null: false
+  create_table "products", force: :cascade do |t|
+    t.string "name", null: false
+    t.decimal "price", precision: 18, scale: 2, null: false
   end
 
   add_foreign_key "order_products", "orders"

ruby/activerecord/db/schema.rb

@@ -14,7 +14,7 @@
 ActiveRecord::Schema.define(version: 20170207160810) do
 
   create_table "customers", id: :bigserial, force: :cascade do |t|
-    t.text "name", null: false
+    t.string "name", null: false
   end
 
 # Could not dump table "order_products" because of following ArgumentError
@@ -24,8 +24,8 @@
 #   struct size differs
 
   create_table "products", id: :bigserial, force: :cascade do |t|
-    t.text    "name",  null: false
-    t.decimal "price", null: false
+    t.string  "name",                           null: false
+    t.decimal "price", precision: 18, scale: 2, null: false
   end
 
   add_foreign_key "order_products", "orders"

ruby/ar4/db/schema.rb

@@ -47,9 +47,15 @@ type tenantServer interface {
 }
 
 // newServer creates a new cockroachDB server.
-func newServer(t *testing.T) testserver.TestServer {
+func newServer(t *testing.T, insecure bool) testserver.TestServer {
 	t.Helper()
-	ts, err := testserver.NewTestServer()
+	var ts testserver.TestServer
+	var err error
+	if insecure {
+		ts, err = testserver.NewTestServer()
+	} else {
+		ts, err = testserver.NewTestServer(testserver.SecureOpt())
+	}
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -196,6 +202,10 @@ type testInfo struct {
 	language, orm string
 	tableNames    testTableNames  // defaults to defaultTestTableNames
 	columnNames   testColumnNames // defaults to defaultTestColumnNames
+	// insecure is set if ORM does not handle secure servers (client certs).
+	// In that case, we start an insecure server (and don't test in tenant
+	// mode).
+	insecure bool
 }
 
 func testORM(t *testing.T, info testInfo) {
@@ -217,7 +227,7 @@ func testORM(t *testing.T, info testInfo) {
 	}
 	var testCases []testCase
 	{
-		ts := newServer(t)
+		ts := newServer(t, info.insecure)
 		db, dbURL, stopDB := startServerWithApplication(t, ts, app)
 		defer stopDB()
 
@@ -345,19 +355,43 @@ func TestGORM(t *testing.T) {
 }
 
 func TestGOPG(t *testing.T) {
-	testORM(t, testInfo{language: "go", orm: "gopg"})
+	testORM(t, testInfo{
+		language: "go",
+		orm:      "gopg",
+		// GoPG does not support client certs:
+		// https://github.com/go-pg/pg/blob/v10/options.go
+		// If we set up a secure deployment and went through the proxy, it would work (or should anyway), but only
+		// via the 'database' parameter; GoPG also does not support the 'options' parameter.
+		insecure: true,
+	})
 }
 
 func TestHibernate(t *testing.T) {
-	testORM(t, testInfo{language: "java", orm: "hibernate"})
+	testORM(t, testInfo{
+		language: "java",
+		orm:      "hibernate",
+		// Possibly does not unescape the path correctly:
+		// Caused by: java.io.FileNotFoundException:
+		//	%2Ftmp%2Fcockroach-testserver913095208%2Fcerts%2Fca.crt (No such file or directory)
+		insecure: true,
+	})
 }
 
 func TestSequelize(t *testing.T) {
-	testORM(t, testInfo{language: "node", orm: "sequelize"})
+	testORM(t, testInfo{
+		language: "node",
+		orm:      "sequelize",
+		// Requires bespoke code to actually use SSL, see:
+		// https://github.com/sequelize/sequelize/issues/10015
+		insecure: true,
+	})
 }
 
 func TestSQLAlchemy(t *testing.T) {
-	testORM(t, testInfo{language: "python", orm: "sqlalchemy"})
+	testORM(t, testInfo{
+		language: "python",
+		orm:      "sqlalchemy",
+	})
 }
 
 func TestDjango(t *testing.T) {
@@ -366,6 +400,9 @@ func TestDjango(t *testing.T) {
 		orm:         "django",
 		tableNames:  djangoTestTableNames,
 		columnNames: djangoTestColumnNames,
+		// No support for client certs (at least not via the query string).
+		// psycopg2.OperationalError: fe_sendauth: no password supplied
+		insecure: true,
 	})
 }