Merge "Remove hard tabs and trailing whitespace"

keystone/common/sql/migrate_repo/migrate.cfg

@@ -5,16 +5,16 @@ repository_id=keystone
 
 # The name of the database table used to track the schema version.
 # This name shouldn't already be used by your project.
-# If this is changed once a database is under version control, you'll need to 
+# If this is changed once a database is under version control, you'll need to
-# change the table name in each database too. 
+# change the table name in each database too.
 version_table=migrate_version
 
-# When committing a change script, Migrate will attempt to generate the 
+# When committing a change script, Migrate will attempt to generate the
 # sql for all supported databases; normally, if one of them fails - probably
-# because you don't have that database installed - it is ignored and the 
+# because you don't have that database installed - it is ignored and the
-# commit continues, perhaps ending successfully. 
+# commit continues, perhaps ending successfully.
-# Databases in this list MUST compile successfully during a commit, or the 
+# Databases in this list MUST compile successfully during a commit, or the
-# entire commit will fail. List the databases your application will actually 
+# entire commit will fail. List the databases your application will actually
 # be using to ensure your updates to that database work properly.
 # This must be a list; example: ['postgres','sqlite']
 required_dbs=[]

keystone/common/sql/migrate_repo/versions/002_sqlite_downgrade.sql

@@ -1,8 +1,8 @@
 drop table token;
 
 CREATE TABLE token (
-	id VARCHAR(64) NOT NULL, 
+    id VARCHAR(64) NOT NULL,
-	expires DATETIME, 
+    expires DATETIME,
-	extra TEXT, 
+    extra TEXT,
-	PRIMARY KEY (id)
+    PRIMARY KEY (id)
 );

keystone/common/sql/migrate_repo/versions/002_sqlite_upgrade.sql

@@ -1,25 +1,25 @@
 CREATE TABLE token_backup (
-	id_hash VARCHAR(64) NOT NULL,
+    id_hash VARCHAR(64) NOT NULL,
-	id VARCHAR(1024),
+    id VARCHAR(1024),
-	expires DATETIME,
+    expires DATETIME,
-	extra TEXT,
+    extra TEXT,
-	PRIMARY KEY (id_hash)
+    PRIMARY KEY (id_hash)
 );
 
 insert into token_backup
-	select id as old_id,
+    select id as old_id,
-	'',
+    '',
-	expires as old_expires,
+    expires as old_expires,
-	extra as old_extra from token;
+    extra as old_extra from token;
 
 drop table token;
 
 CREATE TABLE token (
-	id_hash VARCHAR(64) NOT NULL,
+    id_hash VARCHAR(64) NOT NULL,
-	id VARCHAR(1024),
+    id VARCHAR(1024),
-	expires DATETIME,
+    expires DATETIME,
-	extra TEXT,
+    extra TEXT,
-	PRIMARY KEY (id_hash)
+    PRIMARY KEY (id_hash)
 );
 
 insert into token select * from token_backup;