Add samples for CloudSQL postgres (GoogleCloudPlatform#390) and renames mysql to cloudsql-mysql

Author: bshaffer

appengine/flexible/cloudsql/README.md …engine/flexible/cloudsql-mysql/README.mdappengine/flexible/cloudsql/README.md renamed to appengine/flexible/cloudsql-mysql/README.md appengine/flexible/cloudsql/README.md renamed to appengine/flexible/cloudsql-mysql/README.md

@@ -36,7 +36,6 @@ Before you can run or deploy the sample, you will need to do the following:
 
         $ mysql -h 127.0.0.1 -u root -p -e "CREATE DATABASE <YOUR_DATABASE_NAME>;"
 
-
 ## Deploy to App Engine
 
 **Prerequisites**
@@ -70,19 +69,19 @@ in your browser.
     installed and running.
 
 1.  Set the following environment variables with the configuration values for
-    `USER`, `PASSWORD`, and `DATABASE` you used during setup:
+    `USER`, `PASSWORD`, `DATABASE`, and `CONNECTION_NAME` you used during setup:
 
     ```sh
     # set local mysql connection parameters
     export MYSQL_DSN="mysql:host=127.0.0.1;port=3306;dbname=DATABASE"
-    export MYSQL_USERNAME=USER
+    export MYSQL_USER=USER
     export MYSQL_PASSWORD=PASSWORD
     ```
 
 1.  Run the application
 
     ```sh
-    cd php-docs-samples/appengine/standard/cloudsql
+    cd php-docs-samples/appengine/flexible/cloudsql
     php -S localhost:8080
     ```
 

appengine/flexible/cloudsql/app.php appengine/flexible/cloudsql-mysql/app.phpappengine/flexible/cloudsql/app.php renamed to appengine/flexible/cloudsql-mysql/app.php

@@ -23,17 +23,19 @@
 // create the Silex application
 $app = new Application();
 
-$app['pdo'] = function ($app) {
-    $pdo = new PDO(
-        $app['mysql.dsn'],
-        $app['mysql.user'],
-        $app['mysql.password']
-    );
-    $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    $pdo->query('CREATE TABLE IF NOT EXISTS visits ' .
-        '(time_stamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, user_ip CHAR(64))');
-    return $pdo;
-};
+// Create the PDO object for CloudSQL MySQL.
+$dsn = getenv('MYSQL_DSN');
+$user = getenv('MYSQL_USER');
+$password = getenv('MYSQL_PASSWORD');
+$pdo = new PDO($dsn, $user, $password);
+
+// Create the database if it doesn't exist
+$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+$pdo->query('CREATE TABLE IF NOT EXISTS visits ' .
+    '(time_stamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, user_ip CHAR(64))');
+
+// Add the PDO object to our Silex application.
+$app['pdo'] = $pdo;
 
 $app->get('/', function (Application $app, Request $request) {
     $ip = $request->GetClientIp();

appengine/flexible/cloudsql/app.yaml …pengine/flexible/cloudsql-mysql/app.yamlappengine/flexible/cloudsql/app.yaml renamed to appengine/flexible/cloudsql-mysql/app.yaml appengine/flexible/cloudsql/app.yaml renamed to appengine/flexible/cloudsql-mysql/app.yaml

@@ -5,13 +5,13 @@ env: flex
 env_variables:
     # Replace USER, PASSWORD, DATABASE, and CONNECTION_NAME with the
     # values obtained when configuring your Cloud SQL instance.
-    MYSQL_DSN: mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME
     MYSQL_USER: USER
     MYSQL_PASSWORD: PASSWORD
+    MYSQL_DSN: mysql:dbname=DATABASE;unix_socket=/cloudsql/CONNECTION_NAME
 #[END env]
 
 #[START cloudsql_settings]
 # Use the connection name obtained when configuring your Cloud SQL instance.
 beta_settings:
     cloud_sql_instances: "CONNECTION_NAME"
-#[END cloudsql_settings]
+#[END cloudsql_settings]

appengine/flexible/cloudsql/composer.json …ne/flexible/cloudsql-mysql/composer.jsonappengine/flexible/cloudsql/composer.json renamed to appengine/flexible/cloudsql-mysql/composer.json appengine/flexible/cloudsql/composer.json renamed to appengine/flexible/cloudsql-mysql/composer.json

@@ -24,7 +24,4 @@
 // Run the app!
 // use "gcloud app deploy"
 $app['debug'] = true;
-$app['mysql.dsn'] = getenv('MYSQL_DSN');
-$app['mysql.user'] = getenv('MYSQL_USER');
-$app['mysql.password'] = getenv('MYSQL_PASSWORD');
 $app->run();

appengine/flexible/cloudsql/composer.lock …ne/flexible/cloudsql-mysql/composer.lockappengine/flexible/cloudsql/composer.lock renamed to appengine/flexible/cloudsql-mysql/composer.lock appengine/flexible/cloudsql/composer.lock renamed to appengine/flexible/cloudsql-mysql/composer.lock

@@ -32,23 +32,26 @@ public function testIndex()
         $this->assertContains("Last 10 visits:", (string) $resp->getBody());
     }
 
-    public function beforeDeploy()
+    public static function beforeDeploy()
     {
         $tmpDir = FileUtil::cloneDirectoryIntoTmp(__DIR__ . '/..');
         self::$gcloudWrapper->setDir($tmpDir);
         chdir($tmpDir);
 
-        $connectionName = getenv('CLOUDSQL_CONNECTION_NAME');
+        $connectionName = getenv('CLOUDSQL_CONNECTION_NAME_MYSQL');
         $user = getenv('MYSQL_USER');
+        $database = getenv('MYSQL_DATABASE');
         $password = getenv('MYSQL_PASSWORD');
 
-        $appYaml = Yaml::parse(file_get_contents('app.yaml'));
+        $appYamlContents = file_get_contents('app.yaml');
+
+        $appYaml = Yaml::parse($appYamlContents);
         $appYaml['env_variables']['MYSQL_USER'] = $user;
         $appYaml['env_variables']['MYSQL_PASSWORD'] = $password;
         $appYaml['beta_settings']['cloud_sql_instances'] = $connectionName;
         $appYaml['env_variables']['MYSQL_DSN'] = str_replace(
             ['DATABASE', 'CONNECTION_NAME'],
-            ['cloud_samples_tests_php', $connectionName],
+            [$database, $connectionName],
             $appYaml['env_variables']['MYSQL_DSN']
         );
 

appengine/flexible/cloudsql/index.php …engine/flexible/cloudsql-mysql/index.phpappengine/flexible/cloudsql/index.php renamed to appengine/flexible/cloudsql-mysql/index.php appengine/flexible/cloudsql/index.php renamed to appengine/flexible/cloudsql-mysql/index.php

@@ -29,12 +29,9 @@ public function setUp()
     public function createApplication()
     {
         $app = require __DIR__ . '/../app.php';
-        $app['mysql.dsn'] = getenv('MYSQL_DSN');
-        $app['mysql.user'] = getenv('MYSQL_USER');
-        $app['mysql.password'] = getenv('MYSQL_PASSWORD');
-        if ($app['mysql.dsn'] === false ||
-            $app['mysql.user'] === false ||
-            $app['mysql.password'] === false) {
+        if (getenv('MYSQL_DSN') === false ||
+            getenv('MYSQL_USER') === false ||
+            getenv('MYSQL_PASSWORD') === false) {
             $this->markTestSkipped('set the MYSQL_DSN, MYSQL_USER and MYSQL_PASSWORD environment variables');
         }
         return $app;