From: Hamatoma <author@hamatoma.de>
Date: Tue, 20 Oct 2020 16:03:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://gitweb.hamatoma.de/?a=commitdiff_plain;h=d42995558a749e4a00e5a8cb35d6189a792e3de2;p=flutter_bones.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	data/ddl/role.sql
#	data/ddl/user.sql
#	data/rest/role.yaml
#	data/rest/user.yaml
#	lib/src/persistence/persistence.dart
#	lib/src/persistence/rest_persistence.dart
#	lib/src/widget/filters.dart
#	lib/src/widget/module_controller.dart
#	lib/src/widget/text_form_field_bone.dart
#	test/rest_persistence_test.dart
---

d42995558a749e4a00e5a8cb35d6189a792e3de2
diff --cc data/ddl/role.sql
index cba827e,73b38db..a061d41
--- a/data/ddl/role.sql
+++ b/data/ddl/role.sql
@@@ -1,12 -1,12 +1,26 @@@
++<<<<<<< HEAD
 +DROP TABLE IF EXISTS role;
 +CREATE TABLE role (
 +  role_id INT(10) UNSIGNED NOT NULL UNIQUE AUTO_INCREMENT,
 +  role_name VARCHAR(32) UNIQUE NOT NULL,
 +  role_priority INT(10),
 +  role_active CHAR(1),
 +  role_createdat TIMESTAMP NULL,
 +  role_createdby VARCHAR(16),
 +  role_changedat TIMESTAMP NULL,
 +  role_changedby VARCHAR(16),
 +  PRIMARY KEY(role_id)
++=======
+ drop table if exists role;
+ create table role (
+   role_id int(10) notnull unique,
+   role_name varchar(32) unique notnull,
+   role_priority int(10),
+   role_active char(1),
+   role_createdat timestamp null,
+   role_createdby varchar(16),
+   role_changedat timestamp null,
+   role_changedby varchar(16),
+   primary role_id
++>>>>>>> origin/master
  );
diff --cc data/ddl/user.sql
index 84441b6,1b4d6b7..2d23956
--- a/data/ddl/user.sql
+++ b/data/ddl/user.sql
@@@ -1,14 -1,14 +1,30 @@@
++<<<<<<< HEAD
 +DROP TABLE IF EXISTS user;
 +CREATE TABLE user (
 +  user_id INT(10) UNSIGNED NOT NULL UNIQUE AUTO_INCREMENT,
 +  user_name VARCHAR(64) UNIQUE NOT NULL,
 +  user_displayname VARCHAR(32) UNIQUE,
 +  user_email VARCHAR(128) UNIQUE,
 +  user_password VARCHAR(128),
 +  user_role INT(10) UNSIGNED,
 +  user_createdat TIMESTAMP NULL,
 +  user_createdby VARCHAR(16),
 +  user_changedat TIMESTAMP NULL,
 +  user_changedby VARCHAR(16),
 +  PRIMARY KEY(user_id)
++=======
+ drop table if exists user;
+ create table user (
+   user_id int(10) notnull unique,
+   user_name varchar(64) unique notnull,
+   user_displayname varchar(32) unique,
+   user_email varchar(128) unique,
+   user_password varchar(128),
+   user_role int(10),
+   user_createdat timestamp null,
+   user_createdby varchar(16),
+   user_changedat timestamp null,
+   user_changedby varchar(16),
+   primary user_id
++>>>>>>> origin/master
  );